This is the mail archive of the
newlib@sourceware.org
mailing list for the newlib project.
[PATCH 21/22] Unify addr_t definition
- 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:41 +0200
- Subject: [PATCH 21/22] Unify addr_t definition
- Authentication-results: sourceware.org; auth=none
- References: <1460986182-11952-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 | 5 +++--
winsup/cygwin/include/cygwin/types.h | 5 -----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
index 51b52e5..674cd30 100644
--- a/newlib/libc/include/sys/types.h
+++ b/newlib/libc/include/sys/types.h
@@ -190,9 +190,10 @@ typedef __ino_t ino_t; /* inode number */
#define _INO_T_DECLARED
#endif
-#if defined(__i386__) && (defined(GO32) || defined(__MSDOS__))
+#if defined(__CYGWIN__) || \
+ (defined(__i386__) && (defined(GO32) || defined(__MSDOS__)))
typedef char * addr_t;
-#endif /* __i386__ && (GO32 || __MSDOS__) */
+#endif /* __CYGWIN__ || (__i386__ && (GO32 || __MSDOS__)) */
/*
* All these should be machine specific - right now they are all broken.
diff --git a/winsup/cygwin/include/cygwin/types.h b/winsup/cygwin/include/cygwin/types.h
index e4f7371..e2582af 100644
--- a/winsup/cygwin/include/cygwin/types.h
+++ b/winsup/cygwin/include/cygwin/types.h
@@ -58,11 +58,6 @@ struct flock {
typedef void *vm_object_t;
#endif /* __vm_object_t_defined */
-#ifndef __addr_t_defined
-#define __addr_t_defined
-typedef char *addr_t;
-#endif
-
#if !defined(__INSIDE_CYGWIN__) || !defined(__cplusplus)
typedef struct __pthread_t {char __dummy;} *pthread_t;
--
1.8.4.5