diff options
| author | Rob Landley <rob@landley.net> | 2014-11-19 16:55:12 -0600 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2014-11-19 16:55:12 -0600 |
| commit | 561478541dbeb92e2c82c2fda7b43461293938e9 (patch) | |
| tree | 6371132e393c80fc5c26655dab9a9961f9d96412 /lib | |
| parent | 46ddf0e34b03f7711a9c80f7a70dc8cbf732f782 (diff) | |
| download | toybox-561478541dbeb92e2c82c2fda7b43461293938e9.tar.gz | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/portability.h | 8 |
1 files changed, 5 insertions, 3 deletions
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 <shadow.h> #endif -#if defined(CFG_TOYBOX_UTMPX) && CFG_TOYBOX_UTMPX +#if CFG_TOYBOX_UTMPX #include <utmpx.h> #endif -#if defined(CFG_TOYBOX_PTY) && CFG_TOYBOX_PTY +#if CFG_TOYBOX_PTY #include <pty.h> +#else +pid_t forkpty(int *amaster, char *name, void *termp, void *winp); #endif |