@ -1,6 +1,6 @@
--- a/lib/commands/toolcontext.c
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -1649,7 +164 9,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
@@ -1599,7 +159 9,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
/* FIXME Make this configurable? */
/* FIXME Make this configurable? */
reset_lvm_errno(1);
reset_lvm_errno(1);
@ -9,10 +9,10 @@
/* Set in/out stream buffering before glibc */
/* Set in/out stream buffering before glibc */
if (set_buffering
if (set_buffering
#ifdef SYS_gettid
#ifdef SYS_gettid
@@ -2031,7 +2031,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
if (cmd->libmem)
dm_pool_destroy(cmd->libmem);
@@ -1980,7 +1980,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
if (cmd->pending_delete_mem)
dm_pool_destroy(cmd->pending_delete_mem);
-#ifndef VALGRIND_POOL
-#ifndef VALGRIND_POOL
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
if (cmd->linebuffer) {
if (cmd->linebuffer) {
@ -20,7 +20,7 @@
if (is_valid_fd(STDIN_FILENO) &&
if (is_valid_fd(STDIN_FILENO) &&
--- a/tools/lvmcmdline.c
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -3055 ,6 +3055 ,7 @@ int lvm_split(char *str, int *argc, char **argv, int max)
@@ -323 0,6 +323 0,7 @@ int lvm_split(char *str, int *argc, char **argv, int max)
/* Make sure we have always valid filedescriptors 0,1,2 */
/* Make sure we have always valid filedescriptors 0,1,2 */
static int _check_standard_fds(void)
static int _check_standard_fds(void)
{
{
@ -28,7 +28,7 @@
int err = is_valid_fd(STDERR_FILENO);
int err = is_valid_fd(STDERR_FILENO);
if (!is_valid_fd(STDIN_FILENO) &&
if (!is_valid_fd(STDIN_FILENO) &&
@@ -3081,6 +3082 ,12 @@ static int _check_standard_fds(void)
@@ -3256,6 +3257 ,12 @@ static int _check_standard_fds(void)
strerror(errno));
strerror(errno));
return 0;
return 0;
}
}