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 --- sys/resource.h | 20 ++++++++++---------- sys/sem.h | 2 +- sys/time.h | 21 ++++++++++----------- 3 files changed, 21 insertions(+), 22 deletions(-) (limited to 'sys') 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) -- cgit v1.2.1