This is the mail archive of the
newlib-cvs@sourceware.org
mailing list for the newlib project.
[newlib-cygwin] Add BSD guard for clockid_t
- From: Corinna Vinschen <corinna at sourceware dot org>
- To: newlib-cvs at sourceware dot org
- Date: 15 Apr 2016 12:54:34 -0000
- Subject: [newlib-cygwin] Add BSD guard for clockid_t
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=326f8962a1a053ca238f550083b745e540a6dddb
commit 326f8962a1a053ca238f550083b745e540a6dddb
Author: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Fri Apr 15 13:44:18 2016 +0200
Add BSD guard for clockid_t
Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
Diff:
---
newlib/libc/include/sys/_types.h | 4 +++-
newlib/libc/include/sys/types.h | 7 ++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h
index 1ba4c64..6e6e2d3 100644
--- a/newlib/libc/include/sys/_types.h
+++ b/newlib/libc/include/sys/_types.h
@@ -151,7 +151,9 @@ typedef _CLOCK_T_ __clock_t;
#define _TIME_T_ long /* time() */
typedef _TIME_T_ __time_t;
-#define _CLOCKID_T_ unsigned long
+#define _CLOCKID_T_ unsigned long
+typedef _CLOCKID_T_ __clockid_t;
+
#define _TIMER_T_ unsigned long
typedef long __suseconds_t; /* microseconds (signed) */
diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
index 2338cf5..f8db419 100644
--- a/newlib/libc/include/sys/types.h
+++ b/newlib/libc/include/sys/types.h
@@ -191,9 +191,10 @@ typedef __mode_t mode_t; /* permissions */
typedef unsigned short nlink_t;
-#ifndef __clockid_t_defined
-typedef _CLOCKID_T_ clockid_t;
-#define __clockid_t_defined
+#if !defined(__clockid_t_defined) && !defined(_CLOCKID_T_DECLARED)
+typedef __clockid_t clockid_t;
+#define __clockid_t_defined
+#define _CLOCKID_T_DECLARED
#endif
#ifndef __timer_t_defined