diff --git a/ChangeLog b/ChangeLog index bc74cef9b7..29b22d96da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2001-02-14 Ulrich Drepper + * time/sys/time.h: Make settimeofday and adjtime available if + _BSD_SOURCE. + + * time/sys/time.h: Make timer* macros available for BSD. + * iconvdata/gb18030.c: Update for Dec 2000 re-release of GB18030. Patch by Yong Li . diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 94c0dcc1d9..bd2debb725 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,8 @@ +2001-02-14 Ulrich Drepper + + * charmaps/GB18030: Update for Dec 2000 re-release of GB18030. + Patch by Yong Li . + 2001-02-13 Ulrich Drepper * SUPPORTED: Add zh_CN.GBK. diff --git a/time/sys/time.h b/time/sys/time.h index 9fa53efce3..031134011c 100644 --- a/time/sys/time.h +++ b/time/sys/time.h @@ -50,7 +50,7 @@ __BEGIN_DECLS #endif -#if defined __USE_GNU || defined __USE_BSD +#ifdef __USE_BSD /* Structure crudely representing a timezone. This is obsolete and should never be used. */ struct timezone @@ -72,7 +72,7 @@ typedef void *__restrict __timezone_ptr_t; extern int gettimeofday (struct timeval *__restrict __tv, __timezone_ptr_t __tz) __THROW; -#ifdef __USE_MISC +#ifdef __USE_BSD /* Set the current time of day and timezone information. This call is restricted to the super-user. */ extern int settimeofday (__const struct timeval *__tv, @@ -136,7 +136,7 @@ extern int utimes (__const char *__file, __const struct timeval __tvp[2]) __THROW; -#ifdef __USE_GNU +#ifdef __USE_BSD /* Convenience macros for operations on timevals. NOTE: `timercmp' does not work for >= or <=. */ # define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) @@ -164,7 +164,7 @@ extern int utimes (__const char *__file, __const struct timeval __tvp[2]) (result)->tv_usec += 1000000; \ } \ } while (0) -#endif /* GNU */ +#endif /* BSD */ __END_DECLS