@ -1,6 +1,6 @@
--- a/lib/commands/toolcontext.c
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -1677,7 +1677 ,7 @@ struct cmd_context *create_toolcontext(u
@@ -1673,7 +1673 ,7 @@ struct cmd_context *create_toolcontext(u
/* 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
@@ -2064,7 +2064,7 @@ void destroy_toolcontext(struct cmd_cont
@@ -2053,7 +2053,7 @@ void destroy_toolcontext(struct cmd_cont
dm_hash_destroy(cmd->cft_def_hash);
if (cmd->pending_delete_mem)
dm_pool_destroy(cmd->pending_delete_mem);
dm_device_list_destroy(&cmd->cache_dm_devs);
-#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
@@ -3381 ,6 +3381 ,7 @@ int lvm_split(char *str, int *argc, char
@@ -339 8,6 +339 8,7 @@ int lvm_split(char *str, int *argc, char
/* 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) &&
@@ -3407,6 +3408 ,12 @@ static int _check_standard_fds(void)
@@ -3424,6 +3425 ,12 @@ static int _check_standard_fds(void)
strerror(errno));
strerror(errno));
return 0;
return 0;
}
}