aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-05-22 06:07:58 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-22 06:07:58 -0700
commitbd83aabe5a14f6e741c80b61f8d0d981baeb2e70 (patch)
treebbd1e003efaa7280ff5b1839a7e25cd94b410867
parent95770f140bf0c9ecb8ee3a9c00de5248e7e5cc61 (diff)
downloadglibc-bd83aabe5a14f6e741c80b61f8d0d981baeb2e70.tar
glibc-bd83aabe5a14f6e741c80b61f8d0d981baeb2e70.tar.gz
glibc-bd83aabe5a14f6e741c80b61f8d0d981baeb2e70.tar.bz2
glibc-bd83aabe5a14f6e741c80b61f8d0d981baeb2e70.zip
mktime: merge <sys/types.h> change from gnulib
-rw-r--r--ChangeLog4
-rw-r--r--time/mktime.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ad865fdfd3..d33c22359a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2012-05-22 Paul Eggert <eggert@cs.ucla.edu>
+ mktime: merge <sys/types.h> change from gnulib
+ * time/mktime.c: Do not include <sys/types.h>; no longer needed,
+ since <time.t> is now guaranteed to define time_t.
+
mktime: merge HAVE_CONFIG_H change from gnulib
* time/mktime.c: Include <config.h> if !_LIBC, not if HAVE_CONFIG_H.
diff --git a/time/mktime.c b/time/mktime.c
index 0e5fde015b..e4b3b66bc8 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -32,7 +32,6 @@
# define LEAP_SECONDS_POSSIBLE 1
#endif
-#include <sys/types.h> /* Some systems define `time_t' here. */
#include <time.h>
#include <limits.h>