diff options
| -rw-r--r-- | include/bits/limits.h | 5 | ||||
| -rw-r--r-- | include/bits/stdio.h | 9 | ||||
| -rw-r--r-- | include/limits.h | 8 | ||||
| -rw-r--r-- | include/stdio.h | 51 | ||||
| -rw-r--r-- | include/stdlib.h | 97 | ||||
| -rw-r--r-- | src/temp/mkdtemp.c | 1 | ||||
| -rw-r--r-- | src/temp/mkstemp.c | 1 |
7 files changed, 102 insertions, 70 deletions
diff --git a/include/bits/limits.h b/include/bits/limits.h index 48fdd7a1..f5778579 100644 --- a/include/bits/limits.h +++ b/include/bits/limits.h @@ -1,3 +1,5 @@ +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) #define PIPE_BUF 4096 #define PAGESIZE 4096 #define PAGE_SIZE PAGESIZE @@ -10,9 +12,9 @@ #define ARG_MAX 131072 #define IOV_MAX 1024 #define SYMLOOP_MAX 40 - #define WORD_BIT 32 #define LONG_BIT 32 +#endif #define SHRT_MIN (-1-0x7fff) #define SHRT_MAX 0x7fff @@ -29,4 +31,3 @@ #define LLONG_MIN (-1-0x7fffffffffffffffLL) #define LLONG_MAX 0x7fffffffffffffffLL #define ULLONG_MAX 0xffffffffffffffffULL - diff --git a/include/bits/stdio.h b/include/bits/stdio.h index 0afd8b40..b4611f3f 100644 --- a/include/bits/stdio.h +++ b/include/bits/stdio.h @@ -5,6 +5,13 @@ #define TMP_MAX 10000 #define L_cuserid 20 -#define L_ctermid 20 #define L_tmpnam 20 + +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) +#define L_ctermid 20 +#endif + +#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) #define P_tmpdir "/tmp" +#endif diff --git a/include/limits.h b/include/limits.h index 61920c7d..6d7dfdbb 100644 --- a/include/limits.h +++ b/include/limits.h @@ -13,9 +13,13 @@ #define UCHAR_MAX 255 #define CHAR_MIN (-128) #define CHAR_MAX 127 -#define SSIZE_MAX LONG_MAX #define MB_LEN_MAX 4 + +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) + +#define SSIZE_MAX LONG_MAX #define TZNAME_MAX 6 #define TTY_NAME_MAX 20 #define HOST_NAME_MAX 255 @@ -100,3 +104,5 @@ #define _XOPEN_PATH_MAX 1024 #endif + +#endif diff --git a/include/stdio.h b/include/stdio.h index b00436d9..7441cae4 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -8,8 +8,12 @@ extern "C" { #define __NEED_FILE #define __NEED_va_list #define __NEED_size_t + +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) #define __NEED_ssize_t #define __NEED_off_t +#endif #include <bits/alltypes.h> @@ -50,26 +54,19 @@ extern FILE *const stderr; #define stderr (stderr) FILE *fopen(const char *, const char *); -FILE *fdopen(int, const char *); FILE *freopen(const char *, const char *, FILE *); int fclose(FILE *); -FILE *popen(const char *, const char *); -int pclose(FILE *); - int remove(const char *); int rename(const char *, const char *); -int fileno(FILE *); int feof(FILE *); int ferror(FILE *); int fflush(FILE *); void clearerr(FILE *); int fseek(FILE *, long, int); -int fseeko(FILE *, off_t, int); long ftell(FILE *); -off_t ftello(FILE *); void rewind(FILE *); int fgetpos(FILE *, fpos_t *); @@ -103,9 +100,6 @@ int vfprintf(FILE *, const char *, va_list); int vsprintf(char *, const char *, va_list); int vsnprintf(char *, size_t, const char *, va_list); -int dprintf(int, const char *, ...); -int vdprintf(int, const char *, va_list); - int scanf(const char *, ...); int fscanf(FILE *, const char *, ...); int sscanf(const char *, const char *, ...); @@ -115,6 +109,22 @@ int vsscanf(const char *, const char *, va_list); void perror(const char *); +int setvbuf(FILE *, char *, int, size_t); +void setbuf(FILE *, char *); + +char *tmpnam(char *); +FILE *tmpfile(void); + +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) +FILE *fdopen(int, const char *); +FILE *popen(const char *, const char *); +int pclose(FILE *); +int fileno(FILE *); +int fseeko(FILE *, off_t, int); +off_t ftello(FILE *); +int dprintf(int, const char *, ...); +int vdprintf(int, const char *, va_list); void flockfile(FILE *); int ftrylockfile(FILE *); void funlockfile(FILE *); @@ -122,20 +132,21 @@ int getc_unlocked(FILE *); int getchar_unlocked(void); int putc_unlocked(int, FILE *); int putchar_unlocked(int); +ssize_t getdelim(char **, size_t *, int, FILE *); +ssize_t getline(char **, size_t *, FILE *); +int renameat(int, const char *, int, const char *); +char *ctermid(char *); +#endif -int setvbuf(FILE *, char *, int, size_t); -void setbuf(FILE *, char *); -char *tmpnam(char *); +#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) char *tempnam(const char *, const char *); -FILE *tmpfile(void); - -char *ctermid(char *); - -ssize_t getdelim(char **, size_t *, int, FILE *); -ssize_t getline(char **, size_t *, FILE *); +#endif -int renameat(int, const char *, int, const char *); +#if defined(_GNU_SOURCE) +#undef off64_t +#define off64_t off_t +#endif #ifdef __cplusplus } diff --git a/include/stdlib.h b/include/stdlib.h index 6dbbc9cb..045756bc 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -28,59 +28,26 @@ long double strtold (const char *, char **); long strtol (const char *, char **, int); unsigned long strtoul (const char *, char **, int); - long long strtoll (const char *, char **, int); unsigned long long strtoull (const char *, char **, int); -char *l64a (long); -long a64l (const char *); - -long int random (void); -void srandom (unsigned int); -char *initstate (unsigned int, char *, size_t); -char *setstate (char *); - int rand (void); void srand (unsigned); -int rand_r (unsigned *); - -double drand48 (void); -double erand48 (unsigned short [3]); -long int lrand48 (void); -long int nrand48 (unsigned short [3]); -long mrand48 (void); -long jrand48 (unsigned short [3]); -void srand48 (long); -unsigned short *seed48 (unsigned short [3]); -void lcong48 (unsigned short [7]); void *malloc (size_t); void *calloc (size_t, size_t); void *realloc (void *, size_t); void free (void *); -void *valloc (size_t); -int posix_memalign (void **, size_t, size_t); void abort (void); int atexit (void (*) (void)); void exit (int); void _Exit (int); - char *getenv (const char *); -int putenv (char *); -int setenv (const char *, const char *, int); -int unsetenv (const char *); - - -char *mktemp (char *); -int mkstemp (char *); int system (const char *); - -char *realpath (const char *, char *); - void *bsearch (const void *, const void *, size_t, size_t, int (*)(const void *, const void *)); void qsort (void *, size_t, size_t, int (*)(const void *, const void *)); @@ -89,14 +56,12 @@ long labs (long); long long llabs (long long); typedef struct { int quot, rem; } div_t; -extern div_t div (int, int); - typedef struct { long quot, rem; } ldiv_t; -ldiv_t ldiv (long, long); - typedef struct { long long quot, rem; } lldiv_t; -lldiv_t lldiv (long long, long long); +div_t div (int, int); +ldiv_t ldiv (long, long); +lldiv_t lldiv (long long, long long); int mblen (const char *, size_t); int mbtowc (wchar_t *, const char *, size_t); @@ -104,23 +69,63 @@ int wctomb (char *, wchar_t); size_t mbstowcs (wchar_t *, const char *, size_t); size_t wcstombs (char *, const wchar_t *, size_t); +#define MB_CUR_MAX 4 + +#define RAND_MAX (0x7fffffff) + + +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) + +#ifndef WEXITSTATUS +#include <bits/wexitstatus.h> +#endif + +#define EXIT_FAILURE 1 +#define EXIT_SUCCESS 0 + +int posix_memalign (void **, size_t, size_t); +int setenv (const char *, const char *, int); +int unsetenv (const char *); +int mkstemp (char *); +char *mkdtemp (char *); int getsubopt (char **, char *const *, char **); +int rand_r (unsigned *); -void setkey (const char *); +#endif + +#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) +int putenv (char *); int posix_openpt (int); int grantpt (int); int unlockpt (int); char *ptsname (int); +char *realpath (const char *, char *); +char *l64a (long); +long a64l (const char *); +void setkey (const char *); +long int random (void); +void srandom (unsigned int); +char *initstate (unsigned int, char *, size_t); +char *setstate (char *); +double drand48 (void); +double erand48 (unsigned short [3]); +long int lrand48 (void); +long int nrand48 (unsigned short [3]); +long mrand48 (void); +long jrand48 (unsigned short [3]); +void srand48 (long); +unsigned short *seed48 (unsigned short [3]); +void lcong48 (unsigned short [7]); +#endif -#define MB_CUR_MAX 4 - -#define RAND_MAX (0x7fffffff) - -#define EXIT_FAILURE 1 -#define EXIT_SUCCESS 0 +#if defined(_GNU_SOURCE) +char *mktemp (char *); +void *valloc (size_t); +void *memalign(size_t, size_t); +#endif -#include <bits/wexitstatus.h> #ifdef __cplusplus } diff --git a/src/temp/mkdtemp.c b/src/temp/mkdtemp.c index f8b067ec..cb030ee4 100644 --- a/src/temp/mkdtemp.c +++ b/src/temp/mkdtemp.c @@ -1,3 +1,4 @@ +#define _GNU_SOURCE #include <string.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/temp/mkstemp.c b/src/temp/mkstemp.c index b1567191..32c6be57 100644 --- a/src/temp/mkstemp.c +++ b/src/temp/mkstemp.c @@ -1,3 +1,4 @@ +#define _GNU_SOURCE #include <string.h> #include <stdio.h> #include <stdlib.h> |