From 73ba67cbc3941c3bcfda31a22a9d0d97ac928f3b Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 13 May 2014 17:04:27 +0200 Subject: [PATCH] Fix macro warning on HAVE_PT_CHOWN --- ChangeLog | 6 ++++++ config.h.in | 2 +- sysdeps/unix/grantpt.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e66dafc40d..7d9a8b7eaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-05-14 Andreas Schwab + + * config.h.in (HAVE_PT_CHOWN): Define as 0. + * sysdeps/unix/grantpt.c (grantpt): Check HAVE_PT_CHOWN for value, + not definedness. + 2014-05-14 Joseph Myers * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_UTIMES): diff --git a/config.h.in b/config.h.in index b6e3623d92..a9ff1e3ac1 100644 --- a/config.h.in +++ b/config.h.in @@ -251,7 +251,7 @@ #undef HAVE_ARM_PCS_VFP /* The pt_chown binary is being built and used by grantpt. */ -#undef HAVE_PT_CHOWN +#define HAVE_PT_CHOWN 0 /* ports/sysdeps/mips/configure.in */ /* Define if using the IEEE 754-2008 NaN encoding on the MIPS target. */ diff --git a/sysdeps/unix/grantpt.c b/sysdeps/unix/grantpt.c index 410dc50cf9..2cb277cc00 100644 --- a/sysdeps/unix/grantpt.c +++ b/sysdeps/unix/grantpt.c @@ -176,7 +176,7 @@ grantpt (int fd) /* We have to use the helper program if it is available. */ helper:; -#ifdef HAVE_PT_CHOWN +#if HAVE_PT_CHOWN pid_t pid = __fork (); if (pid == -1) goto cleanup; -- 2.11.4.GIT