Mercurial > hg > toybox
changeset 713:ff8a27d3ab8f
The headers of uClibc and older glibc got unhappy with O_DIRECTORY and some other stuff. Fix it up in portability.h.
author | Rob Landley <rob@landley.net> |
---|---|
date | Mon, 26 Nov 2012 23:24:07 -0600 |
parents | a950dd960593 |
children | ed026abefd63 |
files | lib/portability.h |
diffstat | 1 files changed, 16 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/portability.h Mon Nov 26 14:14:29 2012 -0600 +++ b/lib/portability.h Mon Nov 26 23:24:07 2012 -0600 @@ -19,20 +19,28 @@ #include <features.h> -#ifdef __GLIBC__ +#ifndef O_DIRECTORY +#define O_DIRECTORY 0200000 +#endif + +#if defined(__GLIBC__) +// "Function prototypes shall be provided." but aren't. +// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/unistd.h.html +char *crypt(const char *key, const char *salt); + // An SUSv4 function that glibc refuses to #define without crazy #defines, // see http://pubs.opengroup.org/onlinepubs/9699919799/functions/strptime.html #include <time.h> char *strptime(const char *buf, const char *format, struct tm *tm); -// Another one. "Function prototypes shall be provided." but aren't. -// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/unistd.h.html -char *crypt(const char *key, const char *salt); -// And again, from all the way back in posix-2001 -struct tm *getdate(const char *string); + +// uClibc pretends to be glibc and copied a lot of its bugs, but has a few more +#if defined(__UCLIBC__) +#include <unistd.h> +#include <stdio.h> +ssize_t getdelim(char **lineptr, size_t *n, int delim, FILE *stream); // When building under obsolete glibc, hold its hand a bit. - -#if __GLIBC_MINOR__ < 10 && !defined(__UCLIBC__) +#elif __GLIBC_MINOR__ < 10 #define AT_FDCWD -100 #define AT_SYMLINK_NOFOLLOW 0x100 #define AT_REMOVEDIR 0x200