diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 5f5c1d5ca..fcd1c8c82 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2005-11-18 Christopher Faylor + + * times.cc (timezone): Put back (void). + * include/cygwin/time.h: Add more cygwin stuff from newlib. + 2005-11-18 Christopher Faylor * include/cygwin/sys_time.h: Rename from include/cygwin/time.h. diff --git a/winsup/cygwin/include/cygwin/time.h b/winsup/cygwin/include/cygwin/time.h index dadb6ce06..238f779f3 100644 --- a/winsup/cygwin/include/cygwin/time.h +++ b/winsup/cygwin/include/cygwin/time.h @@ -19,6 +19,20 @@ int nanosleep (const struct timespec *, struct timespec *); int clock_setres (clockid_t, struct timespec *); int clock_getres (clockid_t, struct timespec *); +#define TIMER_RELTIME 0 /* For compatibility with HP/UX, Solaris, others? */ + +#ifndef __STRICT_ANSI__ +# ifndef daylight +# define daylight _daylight +# endif + +# ifndef timezonevar +char *timezone (void); +# elif !defined(timezone) +# define timezone _timezone +# endif +#endif /*__STRICT_ANSI__*/ + #ifdef __cplusplus } #endif diff --git a/winsup/cygwin/times.cc b/winsup/cygwin/times.cc index 87eab4f0e..e9c50a724 100644 --- a/winsup/cygwin/times.cc +++ b/winsup/cygwin/times.cc @@ -122,7 +122,7 @@ settimeofday (const struct timeval *tv, const struct timezone *tz) /* timezone: standards? */ extern "C" char * -timezone () +timezone (void) { char *b = _my_tls.locals.timezone_buf;