diff options
-rw-r--r-- | eval.c | 10 | ||||
-rw-r--r-- | io.c | 11 | ||||
-rw-r--r-- | missing.h | 13 | ||||
-rw-r--r-- | process.c | 10 | ||||
-rw-r--r-- | random.c | 10 | ||||
-rw-r--r-- | time.c | 13 |
6 files changed, 13 insertions, 54 deletions
@@ -74,16 +74,6 @@ char *strrchr _((const char*,const char)); #endif #include <sys/types.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#else -#ifndef NT -struct timeval { - long tv_sec; /* seconds */ - long tv_usec; /* and microseconds */ -}; -#endif /* NT */ -#endif #include <signal.h> #include <errno.h> @@ -60,17 +60,6 @@ # define ftello ftell #endif -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#else -#ifndef NT -struct timeval { - long tv_sec; /* seconds */ - long tv_usec; /* and microseconds */ -}; -#endif -#endif - #include <sys/stat.h> /* EMX has sys/param.h, but.. */ @@ -1,6 +1,7 @@ /************************************************ - missing.h - prototype for *.c in ./missing + missing.h - prototype for *.c in ./missing, and + for missing timeval struct $Author$ $Date$ @@ -11,6 +12,16 @@ #ifndef MISSING_H #define MISSING_H +#if defined(HAVE_SYS_TIME_H) +# include <sys/time.h> +#elif !defined(NT) +# define time_t long +struct timeval { + time_t tv_sec; /* seconds */ + time_t tv_usec; /* microseconds */ +}; +#endif + #ifndef HAVE_ACOSH extern double acosh _((double)); extern double asinh _((double)); @@ -22,16 +22,6 @@ #endif #include <time.h> -#ifndef NT -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#else -struct timeval { - long tv_sec; /* seconds */ - long tv_usec; /* and microseconds */ -}; -#endif -#endif /* NT */ #include <ctype.h> struct timeval rb_time_interval _((VALUE)); @@ -144,16 +144,6 @@ genrand_real() #include <unistd.h> #endif #include <time.h> -#ifndef NT -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#else -struct timeval { - long tv_sec; /* seconds */ - long tv_usec; /* and microseconds */ -}; -#endif -#endif /* NT */ static int first = 1; @@ -12,23 +12,12 @@ #include "ruby.h" #include <sys/types.h> - #include <time.h> -#ifndef NT -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#else -#define time_t long -struct timeval { - time_t tv_sec; /* seconds */ - time_t tv_usec; /* and microseconds */ -}; -#endif -#endif /* NT */ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif + #include <math.h> VALUE rb_cTime; |