From c486885ecda309759144ebad16ec4afd566e0bee Mon Sep 17 00:00:00 2001 From: Jakob Kaivo Date: Wed, 12 Aug 2020 19:13:56 -0400 Subject: prevent prepocessor comparisons against empty tokens --- aio.h | 5 +++++ cpio.h | 5 +++++ curses.h | 5 +++++ errno.h | 5 +++++ fcntl.h | 8 +++++++- fmtmsg.h | 5 +++++ fnmatch.h | 5 +++++ ftw.h | 7 ++++++- glob.h | 5 +++++ grp.h | 5 +++++ iconv.h | 5 +++++ langinfo.h | 5 +++++ libgen.h | 5 +++++ limits.h | 5 +++++ locale.h | 5 +++++ math.h | 5 +++++ monetary.h | 5 +++++ mqueue.h | 5 +++++ ndbm.h | 5 +++++ poll.h | 5 +++++ pwd.h | 7 +++++++ re_comp.h | 5 +++++ regex.h | 5 +++++ regexp.h | 5 +++++ sched.h | 5 +++++ search.h | 7 ++++++- semaphore.h | 5 +++++ setjmp.h | 5 +++++ signal.h | 24 +++++++++++++++--------- stdio.h | 5 +++++ stdlib.h | 5 +++++ string.h | 5 +++++ strings.h | 5 +++++ stropts.h | 5 +++++ sys/resource.h | 20 ++++++++++---------- sys/sem.h | 2 +- sys/time.h | 21 ++++++++++----------- syslog.h | 5 +++++ tar.h | 5 +++++ term.h | 5 +++++ termios.h | 5 +++++ time.h | 5 +++++ ucontext.h | 5 +++++ unistd.h | 5 +++++ utime.h | 5 +++++ utmpx.h | 11 ++++++++--- varargs.h | 12 ------------ wordexp.h | 5 +++++ 48 files changed, 260 insertions(+), 49 deletions(-) diff --git a/aio.h b/aio.h index 9da120f..8a080dd 100644 --- a/aio.h +++ b/aio.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/cpio.h b/cpio.h index 754e9d7..deb908b 100644 --- a/cpio.h +++ b/cpio.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/curses.h b/curses.h index a621fba..fe85f81 100644 --- a/curses.h +++ b/curses.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if (defined _XOPEN_SOURCE) /* ./src/curses/A_ATTRIBUTES.c */ #define A_ATTRIBUTES (0x1ff00) diff --git a/errno.h b/errno.h index b83bed7..0f4353e 100644 --- a/errno.h +++ b/errno.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/fcntl.h b/fcntl.h index 501cd38..4a3ed54 100644 --- a/fcntl.h +++ b/fcntl.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L @@ -158,5 +163,6 @@ int fcntl(int __fildes, int __cmd, ...); int open(const char *__path, int __oflag, ...); #endif - #endif + +#include diff --git a/fmtmsg.h b/fmtmsg.h index 5ba459e..c02e133 100644 --- a/fmtmsg.h +++ b/fmtmsg.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if (defined _XOPEN_SOURCE && ((defined _XOPEN_SOURCE_EXTENDED && _XOPEN_SOURCE_EXTENDED == 1) || 500 <= _XOPEN_SOURCE)) /* ./src/fmtmsg/MM_APPL.c */ #define MM_APPL 3 diff --git a/fnmatch.h b/fnmatch.h index f98eed3..1b25d69 100644 --- a/fnmatch.h +++ b/fnmatch.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/ftw.h b/ftw.h index eefb85c..219a486 100644 --- a/ftw.h +++ b/ftw.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L @@ -113,7 +118,7 @@ int ftw(const char * __path, int (*__fn) (const char *, const struct stat * __pt #if (defined _XOPEN_SOURCE && ((defined _XOPEN_SOURCE_EXTENDED && _XOPEN_SOURCE_EXTENDED == 1) || 500 <= _XOPEN_SOURCE)) /* ./src/ftw/nftw.c */ -int nftw(const char * __path, int (*__fn) (const char *, const struct stat *, __int, struct FTW *), int __fd_limit, int __flags); +int nftw(const char * __path, int (*__fn) (const char *, const struct stat *, int, struct FTW *), int __fd_limit, int __flags); #endif diff --git a/glob.h b/glob.h index 1d5f1f2..f95cb7a 100644 --- a/glob.h +++ b/glob.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/grp.h b/grp.h index 450c816..00a7182 100644 --- a/grp.h +++ b/grp.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/iconv.h b/iconv.h index 5cc2673..3daba80 100644 --- a/iconv.h +++ b/iconv.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/langinfo.h b/langinfo.h index 82e4812..e369c2b 100644 --- a/langinfo.h +++ b/langinfo.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/libgen.h b/libgen.h index 4f52129..115726d 100644 --- a/libgen.h +++ b/libgen.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if (defined _XOPEN_SOURCE && ((defined _XOPEN_SOURCE_EXTENDED && _XOPEN_SOURCE_EXTENDED == 1) || 500 <= _XOPEN_SOURCE) && _XOPEN_SOURCE < 600) /* ./src/libgen/__loc1.c */ extern char *__loc1; diff --git a/limits.h b/limits.h index a0d7854..761ef73 100644 --- a/limits.h +++ b/limits.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/locale.h b/locale.h index 87df95a..42d6ff0 100644 --- a/locale.h +++ b/locale.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/math.h b/math.h index 6ea714e..c8f04c5 100644 --- a/math.h +++ b/math.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/monetary.h b/monetary.h index aa74177..0f0ed6e 100644 --- a/monetary.h +++ b/monetary.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/mqueue.h b/mqueue.h index 0fe4df4..c444ab7 100644 --- a/mqueue.h +++ b/mqueue.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/ndbm.h b/ndbm.h index 5a873c0..39f1d1e 100644 --- a/ndbm.h +++ b/ndbm.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if (defined _XOPEN_SOURCE && ((defined _XOPEN_SOURCE_EXTENDED && _XOPEN_SOURCE_EXTENDED == 1) || 500 <= _XOPEN_SOURCE)) /* ./src/ndbm/DBM_INSERT.c */ #define DBM_INSERT 1 diff --git a/poll.h b/poll.h index 6bfebac..ac3bc68 100644 --- a/poll.h +++ b/poll.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/pwd.h b/pwd.h index 870d482..cb0b2d0 100644 --- a/pwd.h +++ b/pwd.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L @@ -35,6 +40,8 @@ SOFTWARE. # elif (_XOPEN_SOURCE >= 500) # define _POSIX_C_SOURCE 199506L # else +# undef _XOPEN_SOURCE +# define _XOPEN_SOURCE 400 # define _POSIX_C_SOURCE 2 # endif #endif diff --git a/re_comp.h b/re_comp.h index 9539cac..39df590 100644 --- a/re_comp.h +++ b/re_comp.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if (defined _XOPEN_SOURCE && ((defined _XOPEN_SOURCE_EXTENDED && _XOPEN_SOURCE_EXTENDED == 1) || 500 <= _XOPEN_SOURCE) && _XOPEN_SOURCE < 600) /* ./src/re_comp/re_comp.c */ char *re_comp(const char *__string); diff --git a/regex.h b/regex.h index cdf18e7..663d7c4 100644 --- a/regex.h +++ b/regex.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/regexp.h b/regexp.h index 94492f5..ee4ae29 100644 --- a/regexp.h +++ b/regexp.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if (defined _XOPEN_SOURCE && _XOPEN_SOURCE < 600) /* ./src/regexp/loc1.c */ extern char *loc1; diff --git a/sched.h b/sched.h index 5190a51..1d60ba8 100644 --- a/sched.h +++ b/sched.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/search.h b/search.h index 539aa69..67ec3e6 100644 --- a/search.h +++ b/search.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if (defined _XOPEN_SOURCE) /* ./src/search/ACTION.c */ #ifndef __TYPE_ACTION_DEFINED__ @@ -95,7 +100,7 @@ void *tfind(const void * __key, void * const * __rootp, int (*__compar) (const v /* ./src/search/tsearch.c */ void *tsearch(const void * __key, void ** __rootp, int (*__compar) (const void *, const void *)); /* ./src/search/twalk.c */ -void twalk(const void * __root, void (*__action) (const void *, __VISIT, __int)); +void twalk(const void * __root, void (*__action) (const void *, VISIT, int)); #endif #if (defined _XOPEN_SOURCE && ((defined _XOPEN_SOURCE_EXTENDED && _XOPEN_SOURCE_EXTENDED == 1) || 500 <= _XOPEN_SOURCE)) diff --git a/semaphore.h b/semaphore.h index b6e6ef1..b2c3e21 100644 --- a/semaphore.h +++ b/semaphore.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/setjmp.h b/setjmp.h index 2143d34..cde1f01 100644 --- a/setjmp.h +++ b/setjmp.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/signal.h b/signal.h index 9b5bc85..749b35d 100644 --- a/signal.h +++ b/signal.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L @@ -337,6 +342,16 @@ struct sigaction { #endif #if (defined _POSIX_C_SOURCE && 199309 <= _POSIX_C_SOURCE) + +/* ./src/signal/union_sigval.c */ +#ifndef __TYPE_union_sigval_DEFINED__ +#define __TYPE_union_sigval_DEFINED__ +union sigval { + int sival_int; + void *sival_ptr; +}; +#endif + /* ./src/signal/struct_sigevent.c */ #ifndef __TYPE_struct_sigevent_DEFINED__ #define __TYPE_struct_sigevent_DEFINED__ @@ -349,15 +364,6 @@ struct sigevent { }; #endif -/* ./src/signal/union_sigval.c */ -#ifndef __TYPE_union_sigval_DEFINED__ -#define __TYPE_union_sigval_DEFINED__ -union sigval { - int sival_int; - void *sival_ptr; -}; -#endif - #endif #if (defined _XOPEN_SOURCE && ((defined _XOPEN_SOURCE_EXTENDED && _XOPEN_SOURCE_EXTENDED == 1) || 500 <= _XOPEN_SOURCE) && _XOPEN_SOURCE < 700) diff --git a/stdio.h b/stdio.h index b6e6708..9fdba12 100644 --- a/stdio.h +++ b/stdio.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/stdlib.h b/stdlib.h index 140f407..6a57d63 100644 --- a/stdlib.h +++ b/stdlib.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/string.h b/string.h index dccd5dd..1a7f8a4 100644 --- a/string.h +++ b/string.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/strings.h b/strings.h index 27b166d..3b150c4 100644 --- a/strings.h +++ b/strings.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/stropts.h b/stropts.h index 954badf..3311a00 100644 --- a/stropts.h +++ b/stropts.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if (defined _XOPEN_SOURCE && ((defined _XOPEN_SOURCE_EXTENDED && _XOPEN_SOURCE_EXTENDED == 1) || 500 <= _XOPEN_SOURCE)) /* ./src/stropts/ANYMARK.c */ #define ANYMARK /* TODO */ diff --git a/sys/resource.h b/sys/resource.h index 08c39ec..5714710 100644 --- a/sys/resource.h +++ b/sys/resource.h @@ -43,7 +43,7 @@ SOFTWARE. /* ./src/sys/resource/RLIMIT_DATA.c */ #define RLIMIT_DATA /* TODO */ /* ./src/sys/resource/RLIMIT_FSIZE.c */ -#define RLIMIT_FSIZE /* TODO */ +#define RLIMIT_FSIZE 1 /* TODO */ /* ./src/sys/resource/RLIMIT_NOFILE.c */ #define RLIMIT_NOFILE /* TODO */ /* ./src/sys/resource/RLIMIT_STACK.c */ @@ -75,6 +75,15 @@ struct rlimit { }; #endif +/* src/sys/time/struct_timeval.c */ +#ifndef __TYPE_struct_timeval_DEFINED__ +#define __TYPE_struct_timeval_DEFINED__ +struct timeval { + time_t tv_sec; + useconds_t tv_usec; +}; +#endif + /* ./src/sys/resource/struct_rusage.c */ #ifndef __TYPE_struct_rusage_DEFINED__ #define __TYPE_struct_rusage_DEFINED__ @@ -84,15 +93,6 @@ struct rusage { }; #endif -/* src/sys/time/struct_timeval.c */ -#ifndef __TYPE_struct_timeval_DEFINED__ -#define __TYPE_struct_timeval_DEFINED__ -struct timeval { - time_t tv_sec; - suseconds_t tv_usec; -}; -#endif - #endif #if (defined _XOPEN_SOURCE && ((defined _XOPEN_SOURCE_EXTENDED && _XOPEN_SOURCE_EXTENDED == 1) || 500 <= _XOPEN_SOURCE)) diff --git a/sys/sem.h b/sys/sem.h index d32215a..856ddb2 100644 --- a/sys/sem.h +++ b/sys/sem.h @@ -141,7 +141,7 @@ struct semid_ds { /* ./src/sys/sem/semctl.c */ int semctl(int __semid, int __semnum, int __cmd, ...); /* ./src/sys/sem/semget.c */ -int semget(__key_t, int __nsems, int __semflg); +int semget(key_t __key, int __nsems, int __semflg); /* ./src/sys/sem/semop.c */ int semop(int __semid, struct sembuf *__sops, size_t __nsops); #endif diff --git a/sys/time.h b/sys/time.h index de9c69d..c3f11de 100644 --- a/sys/time.h +++ b/sys/time.h @@ -51,7 +51,7 @@ SOFTWARE. #ifndef __TYPE_fd_set_DEFINED__ #define __TYPE_fd_set_DEFINED__ typedef struct { - long fds_bits[]; + long fds_bits[100]; } fd_set; #endif @@ -64,24 +64,23 @@ typedef long int time_t; #endif #if (defined _XOPEN_SOURCE && ((defined _XOPEN_SOURCE_EXTENDED && _XOPEN_SOURCE_EXTENDED == 1) || 500 <= _XOPEN_SOURCE)) -/* ./src/sys/time/struct_itimerval.c */ -#ifndef __TYPE_struct_itimerval_DEFINED__ -#define __TYPE_struct_itimerval_DEFINED__ -struct itimerval { - struct timeval it_interval; - struct timeval it_value; -}; -#endif - /* ./src/sys/time/struct_timeval.c */ #ifndef __TYPE_struct_timeval_DEFINED__ #define __TYPE_struct_timeval_DEFINED__ struct timeval { time_t tv_sec; - suseconds_t tv_usec; + useconds_t tv_usec; }; #endif +/* ./src/sys/time/struct_itimerval.c */ +#ifndef __TYPE_struct_itimerval_DEFINED__ +#define __TYPE_struct_itimerval_DEFINED__ +struct itimerval { + struct timeval it_interval; + struct timeval it_value; +}; +#endif #endif #if (!defined __STDC_VERSION__) || (__STDC_VERSION__ < 199901L) diff --git a/syslog.h b/syslog.h index bf5b096..9ad8f3f 100644 --- a/syslog.h +++ b/syslog.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if (defined _XOPEN_SOURCE && ((defined _XOPEN_SOURCE_EXTENDED && _XOPEN_SOURCE_EXTENDED == 1) || 500 <= _XOPEN_SOURCE)) /* ./src/syslog/LOG_ALERT.c */ #define LOG_ALERT (1<<1) diff --git a/tar.h b/tar.h index 543a989..0971336 100644 --- a/tar.h +++ b/tar.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/term.h b/term.h index e49657a..2fcabad 100644 --- a/term.h +++ b/term.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if (defined _XOPEN_SOURCE && ((defined _XOPEN_SOURCE_EXTENDED && _XOPEN_SOURCE_EXTENDED == 1) || 500 <= _XOPEN_SOURCE)) /* ./src/term/acs_chars.c */ #define acs_chars tigetstr("acsc") diff --git a/termios.h b/termios.h index 3199f48..6c46202 100644 --- a/termios.h +++ b/termios.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/time.h b/time.h index 500be67..1eae49b 100644 --- a/time.h +++ b/time.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/ucontext.h b/ucontext.h index 515aaec..a8e4531 100644 --- a/ucontext.h +++ b/ucontext.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/unistd.h b/unistd.h index b0cde05..d662b32 100644 --- a/unistd.h +++ b/unistd.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/utime.h b/utime.h index 2e45eb8..29833a4 100644 --- a/utime.h +++ b/utime.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L diff --git a/utmpx.h b/utmpx.h index 91c8b76..84e7b00 100644 --- a/utmpx.h +++ b/utmpx.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if (defined _XOPEN_SOURCE && ((defined _XOPEN_SOURCE_EXTENDED && _XOPEN_SOURCE_EXTENDED == 1) || 500 <= _XOPEN_SOURCE)) /* ./src/utmpx/BOOT_TIME.c */ #define BOOT_TIME /* TODO */ @@ -51,9 +56,9 @@ SOFTWARE. #ifndef __TYPE_struct_utmpx_DEFINED__ #define __TYPE_struct_utmpx_DEFINED__ struct utmpx { - char ut_user[]; - char ut_id[]; - char ut_line[]; + char ut_user[100]; + char ut_id[100]; + char ut_line[100]; pid_t ut_pid; short ut_type; struct timeval ut_tv; diff --git a/varargs.h b/varargs.h index 990e436..7ce9367 100644 --- a/varargs.h +++ b/varargs.h @@ -28,18 +28,6 @@ SOFTWARE. */ #if (defined _XOPEN_SOURCE && _XOPEN_SOURCE < 600) -/* ./src/varargs/va_alist.c */ -XOPEN(4,600); -/* ./src/varargs/va_arg.c */ -XOPEN(4,600); -/* ./src/varargs/va_dcl.c */ -XOPEN(4,600); -/* ./src/varargs/va_end.c */ -XOPEN(4,600); -/* ./src/varargs/va_list.c */ -XOPEN(4,600); -/* ./src/varargs/va_start.c */ -XOPEN(4,600); #endif diff --git a/wordexp.h b/wordexp.h index ef6f48e..0fd2e17 100644 --- a/wordexp.h +++ b/wordexp.h @@ -27,6 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#if defined _XOPEN_SOURCE && _XOPEN_SOURCE - 1 < 0 +#undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 400 +#endif + #if defined _XOPEN_SOURCE && !defined _POSIX_C_SOURCE # if (_XOPEN_SOURCE >= 700) # define _POSIX_C_SOURCE 200809L -- cgit v1.2.1