This is the mail archive of the
newlib@sourceware.org
mailing list for the newlib project.
[PATCH v2 08/18] Add BSD guard for timer_t
- From: Sebastian Huber <sebastian dot huber at embedded-brains dot de>
- To: newlib at sourceware dot org
- Cc: devel at rtems dot org, Sebastian Huber <sebastian dot huber at embedded-brains dot de>
- Date: Fri, 15 Apr 2016 13:44:19 +0200
- Subject: [PATCH v2 08/18] Add BSD guard for timer_t
- Authentication-results: sourceware.org; auth=none
- References: <1460720669-26900-1-git-send-email-sebastian dot huber at embedded-brains dot de>
Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
---
newlib/libc/include/sys/_types.h | 3 ++-
newlib/libc/include/sys/types.h | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h
index 6e6e2d3..7c2d963 100644
--- a/newlib/libc/include/sys/_types.h
+++ b/newlib/libc/include/sys/_types.h
@@ -154,7 +154,8 @@ typedef _TIME_T_ __time_t;
#define _CLOCKID_T_ unsigned long
typedef _CLOCKID_T_ __clockid_t;
-#define _TIMER_T_ unsigned long
+#define _TIMER_T_ unsigned long
+typedef _TIMER_T_ __timer_t;
typedef long __suseconds_t; /* microseconds (signed) */
diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
index f8db419..d0627fd 100644
--- a/newlib/libc/include/sys/types.h
+++ b/newlib/libc/include/sys/types.h
@@ -197,9 +197,10 @@ typedef __clockid_t clockid_t;
#define _CLOCKID_T_DECLARED
#endif
-#ifndef __timer_t_defined
-typedef _TIMER_T_ timer_t;
-#define __timer_t_defined
+#if !defined(__timer_t_defined) && !defined(_TIMER_T_DECLARED)
+typedef __timer_t timer_t;
+#define __timer_t_defined
+#define _TIMER_T_DECLARED
#endif
typedef unsigned long useconds_t;
--
1.8.4.5