diff options
| author | Isaac Dunham <ibid.ag@gmail.com> | 2014-01-28 10:10:25 -0600 |
|---|---|---|
| committer | Isaac Dunham <ibid.ag@gmail.com> | 2014-01-28 10:10:25 -0600 |
| commit | 714a0db2ade17f61f09816f0f7067f14e049e645 (patch) | |
| tree | 474a960228ff3fda92e657c35cbe30b0a0a59e1d | |
| parent | d7e41f1b6b290dd01512110c62a49bb9af426d5a (diff) | |
| download | toybox-714a0db2ade17f61f09816f0f7067f14e049e645.tar.gz | |
Two changes to shut up GCC:
* __GLIBC__ was checked unconditionally;
this made for a very messy build on musl.
* int fd in chvt is always initialized; GCC 3.4 does not recognize this.
| -rw-r--r-- | lib/portability.h | 2 | ||||
| -rw-r--r-- | toys/other/chvt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/portability.h b/lib/portability.h index 75576204..86484c7f 100644 --- a/lib/portability.h +++ b/lib/portability.h @@ -145,7 +145,7 @@ int clearenv(void); #define SWAP_LE64(x) (x) #endif -#if defined(__APPLE__) || defined(__ANDROID__) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 10) +#if defined(__APPLE__) || defined(__ANDROID__) || (defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 10) ssize_t getdelim(char **lineptr, size_t *n, int delim, FILE *stream); ssize_t getline(char **lineptr, size_t *n, FILE *stream); #endif diff --git a/toys/other/chvt.c b/toys/other/chvt.c index 5016b9b5..65442657 100644 --- a/toys/other/chvt.c +++ b/toys/other/chvt.c @@ -21,7 +21,7 @@ config CHVT void chvt_main(void) { - int vtnum, fd; + int vtnum, fd = fd; char *consoles[]={"/dev/console", "/dev/vc/0", "/dev/tty", NULL}, **cc; vtnum=atoi(*toys.optargs); |