Mercurial > hg > toybox
changeset 1186:8b62561ce52a draft
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.
author | Isaac Dunham <ibid.ag@gmail.com> |
---|---|
date | Tue, 28 Jan 2014 10:10:25 -0600 |
parents | 2a4f1dc494d0 |
children | 18cc63376e66 |
files | lib/portability.h toys/other/chvt.c |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/portability.h Wed Jan 22 23:29:50 2014 -0600 +++ b/lib/portability.h Tue Jan 28 10:10:25 2014 -0600 @@ -145,7 +145,7 @@ #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