From 561478541dbeb92e2c82c2fda7b43461293938e9 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 19 Nov 2014 16:55:12 -0600 Subject: Fixups for the android/bionic build probes patch. The CFG_* symbols are always defined so if() can use them as compile-time constants, so don't if defined() them. Doing USE_BLAH() around variable definitions opens up the same potential for config-dependent build breaks as #ifdefs do, just make the whole command depend on the symbol for now, factor out the utmpx infrastructure later. The PTY probe was always failing because it used NULL without #including the header that defines it. Substitute 0 instead. --- lib/portability.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/portability.h b/lib/portability.h index 5383efaa..0dace962 100644 --- a/lib/portability.h +++ b/lib/portability.h @@ -188,14 +188,16 @@ ssize_t getline(char **lineptr, size_t *n, FILE *stream); int sethostname(const char *name, size_t len); #endif // "generated/config.h" is included first -#if defined(CFG_TOYBOX_SHADOW) && CFG_TOYBOX_SHADOW +#if CFG_TOYBOX_SHADOW #include #endif -#if defined(CFG_TOYBOX_UTMPX) && CFG_TOYBOX_UTMPX +#if CFG_TOYBOX_UTMPX #include #endif -#if defined(CFG_TOYBOX_PTY) && CFG_TOYBOX_PTY +#if CFG_TOYBOX_PTY #include +#else +pid_t forkpty(int *amaster, char *name, void *termp, void *winp); #endif -- cgit v1.2.3