aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-02-14 22:55:40 +0000
committerUlrich Drepper <drepper@redhat.com>2001-02-14 22:55:40 +0000
commit36874b2165b088f18403e49951c4b6a78d311ac0 (patch)
tree76f8297da81b4ca033688cd4fa00061fe069a332
parenta19cac65b09de4a3851dddac992bf3116fbb41ca (diff)
downloadglibc-36874b2165b088f18403e49951c4b6a78d311ac0.zip
glibc-36874b2165b088f18403e49951c4b6a78d311ac0.tar.gz
glibc-36874b2165b088f18403e49951c4b6a78d311ac0.tar.bz2
Update.
* time/sys/time.h: Make settimeofday and adjtime available if _BSD_SOURCE. * time/sys/time.h: Make timer* macros available for BSD.
-rw-r--r--ChangeLog5
-rw-r--r--localedata/ChangeLog5
-rw-r--r--time/sys/time.h8
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index bc74cef..29b22d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2001-02-14 Ulrich Drepper <drepper@redhat.com>
+ * 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 <rigel863@yahoo.com>.
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 94c0dcc..bd2debb 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-14 Ulrich Drepper <drepper@redhat.com>
+
+ * charmaps/GB18030: Update for Dec 2000 re-release of GB18030.
+ Patch by Yong Li <rigel863@yahoo.com>.
+
2001-02-13 Ulrich Drepper <drepper@redhat.com>
* SUPPORTED: Add zh_CN.GBK.
diff --git a/time/sys/time.h b/time/sys/time.h
index 9fa53ef..0311340 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