diff options
| author | Christopher Faylor <me@cgf.cx> | 2005-11-18 15:45:54 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2005-11-18 15:45:54 +0000 |
| commit | d3e81bdac89c4789783cb51ac261bcfbb58df49a (patch) | |
| tree | c81febbdc2c77be6a3a45fb08f32f2f0b0838938 | |
| parent | 808139f1af2a37d898f06664cc2f8124f2b61e70 (diff) | |
| download | newlib-d3e81bdac89c4789783cb51ac261bcfbb58df49a.zip newlib-d3e81bdac89c4789783cb51ac261bcfbb58df49a.tar.gz newlib-d3e81bdac89c4789783cb51ac261bcfbb58df49a.tar.bz2 | |
* include/time.h: Move cygwin declarations to cygwin-specific header.
* include/sys/time.h: Rename cygwin include to "sys_time.h".
| -rw-r--r-- | newlib/ChangeLog | 5 | ||||
| -rw-r--r-- | newlib/libc/include/sys/time.h | 2 | ||||
| -rw-r--r-- | newlib/libc/include/time.h | 14 |
3 files changed, 10 insertions, 11 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 9bf48c2..e2993e2 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2005-11-18 Christopher Faylor <cgf@timesys.com> + + * include/time.h: Move cygwin declarations to cygwin-specific header. + * include/sys/time.h: Rename cygwin include to "sys_time.h". + 2005-11-17 Jeff Johnston <jjohnstn@redhat.com> * libc/sys/linux/dl/dl-local.h: New file based on old dlfcn.h diff --git a/newlib/libc/include/sys/time.h b/newlib/libc/include/sys/time.h index eee5ca7..ffee50f 100644 --- a/newlib/libc/include/sys/time.h +++ b/newlib/libc/include/sys/time.h @@ -24,7 +24,7 @@ struct timezone { }; #ifdef __CYGWIN__ -#include <cygwin/time.h> +#include <cygwin/sys_time.h> #endif /* __CYGWIN__ */ #endif /* _WINSOCK_H */ diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h index 0ef5e95..60603e1 100644 --- a/newlib/libc/include/time.h +++ b/newlib/libc/include/time.h @@ -145,6 +145,10 @@ char *_EXFUN(timezone, (void)); #include <sys/features.h> +#ifdef __CYGWIN__ +#include <cygwin/time.h> +#endif /*__CYGWIN__*/ + #if defined(_POSIX_TIMERS) #include <signal.h> @@ -183,16 +187,6 @@ int _EXFUN(nanosleep, (const struct timespec *rqtp, struct timespec *rmtp)); #ifdef __cplusplus } #endif -#else -#ifdef __CYGWIN__ -#ifdef __cplusplus -extern "C" { -#endif -int _EXFUN(nanosleep, (const struct timespec *rqtp, struct timespec *rmtp)); -#ifdef __cplusplus -} -#endif -#endif /* __CYGWIN__ */ #endif /* _POSIX_TIMERS */ #ifdef __cplusplus |