This is the mail archive of the
newlib@sourceware.org
mailing list for the newlib project.
[PATCH 19/22] Always provide register_t via <sys/types.h>
- From: Sebastian Huber <sebastian dot huber at embedded-brains dot de>
- To: newlib at sourceware dot org
- Cc: Sebastian Huber <sebastian dot huber at embedded-brains dot de>
- Date: Mon, 18 Apr 2016 15:29:39 +0200
- Subject: [PATCH 19/22] Always provide register_t via <sys/types.h>
- Authentication-results: sourceware.org; auth=none
- References: <1460986182-11952-1-git-send-email-sebastian dot huber at embedded-brains dot de>
Always provide register_t via <sys/types.h> for glibc and BSD
compatibility. Define __BIT_TYPES_DEFINED__ to 1 like glibc for legacy
header files.
Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
---
newlib/libc/include/sys/types.h | 6 ++----
winsup/cygwin/include/cygwin/types.h | 10 ----------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
index 1bc3a84..3125292 100644
--- a/newlib/libc/include/sys/types.h
+++ b/newlib/libc/include/sys/types.h
@@ -36,6 +36,8 @@ typedef __uint32_t u_int32_t;
#if ___int64_t_defined
typedef __uint64_t u_int64_t;
#endif
+typedef int register_t;
+#define __BIT_TYPES_DEFINED__ 1
#if defined(__rtems__) || defined(__XMK__)
/*
@@ -192,10 +194,6 @@ typedef __ino_t ino_t; /* inode number */
typedef char * addr_t;
typedef unsigned long vm_offset_t;
typedef unsigned long vm_size_t;
-
-#define __BIT_TYPES_DEFINED__
-
-typedef int32_t register_t;
#endif /* __i386__ && (GO32 || __MSDOS__) */
/*
diff --git a/winsup/cygwin/include/cygwin/types.h b/winsup/cygwin/include/cygwin/types.h
index faf08bd..99fa28c 100644
--- a/winsup/cygwin/include/cygwin/types.h
+++ b/winsup/cygwin/include/cygwin/types.h
@@ -53,9 +53,6 @@ struct flock {
pid_t l_pid; /* returned with F_GETLK */
};
-#ifndef __BIT_TYPES_DEFINED
-#define __BIT_TYPES_DEFINED__ 1
-
#ifndef __vm_offset_t_defined
#define __vm_offset_t_defined
typedef unsigned long vm_offset_t;
@@ -71,18 +68,11 @@ typedef unsigned long vm_size_t;
typedef void *vm_object_t;
#endif /* __vm_object_t_defined */
-#ifndef __register_t_defined
-#define __register_t_defined
-typedef __int32_t register_t;
-#endif
-
#ifndef __addr_t_defined
#define __addr_t_defined
typedef char *addr_t;
#endif
-#endif /*__BIT_TYPES_DEFINED*/
-
#if !defined(__INSIDE_CYGWIN__) || !defined(__cplusplus)
typedef struct __pthread_t {char __dummy;} *pthread_t;
--
1.8.4.5