diff options
| author | Christopher Faylor <me@cgf.cx> | 2005-11-18 18:57:16 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2005-11-18 18:57:16 +0300 |
| commit | 4c57fb4960d45e3baa745e30a1372e9b87a4413c (patch) | |
| tree | 608a60517f8724457efc8fbffba76f4710cb5769 | |
| parent | d3e81bdac89c4789783cb51ac261bcfbb58df49a (diff) | |
* times.cc (timezone): Put back (void).
* include/cygwin/time.h: Add more cygwin stuff from newlib.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/include/cygwin/time.h | 14 | ||||
| -rw-r--r-- | winsup/cygwin/times.cc | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 5f5c1d5ca..fcd1c8c82 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2005-11-18 Christopher Faylor <cgf@timesys.com> + * times.cc (timezone): Put back (void). + * include/cygwin/time.h: Add more cygwin stuff from newlib. + +2005-11-18 Christopher Faylor <cgf@timesys.com> + * include/cygwin/sys_time.h: Rename from include/cygwin/time.h. * include/cygwin/time.h: New file. 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; |