summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--newlib/ChangeLog6
-rw-r--r--newlib/libc/include/sys/types.h5
2 files changed, 10 insertions, 1 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index d5224cd2b..5a1ef56af 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-26 Christopher Faylor <me.newlib2012@cgf.cx>
+
+ * libc/include/sys/types.h: Don't use the same preprocessor guard for
+ time_t, timespec, and itimerspec. Add a separate guard specifically
+ for timespec and always unconditionally define itimerspec.
+
2012-06-05 Corinna Vinschen <vinschen@redhat.com>
* libc/stdio/findfp.c (__sinit): Avoid infinite recursion on
diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
index 9723d92d3..73e4ed878 100644
--- a/newlib/libc/include/sys/types.h
+++ b/newlib/libc/include/sys/types.h
@@ -109,19 +109,22 @@ typedef _CLOCK_T_ clock_t;
#ifndef __time_t_defined
typedef _TIME_T_ time_t;
#define __time_t_defined
+#endif
+#ifndef __timespec_defined
+#define __timespec_defined
/* Time Value Specification Structures, P1003.1b-1993, p. 261 */
struct timespec {
time_t tv_sec; /* Seconds */
long tv_nsec; /* Nanoseconds */
};
+#endif
struct itimerspec {
struct timespec it_interval; /* Timer period */
struct timespec it_value; /* Timer expiration */
};
-#endif
typedef long daddr_t;
typedef char * caddr_t;