This is the mail archive of the
cygwin-cvs@cygwin.com
mailing list for the Cygwin project.
[newlib-cygwin] Introduce __sa_family_t for BSD compatibiliy
- From: Corinna Vinschen <corinna at sourceware dot org>
- To: cygwin-cvs at sourceware dot org, newlib-cvs at sourceware dot org
- Date: 20 Apr 2016 08:51:09 -0000
- Subject: [newlib-cygwin] Introduce __sa_family_t for BSD compatibiliy
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=e03a7056a67a24a0c63192e5d9ec334fc96291ac
commit e03a7056a67a24a0c63192e5d9ec334fc96291ac
Author: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon Apr 18 15:29:23 2016 +0200
Introduce __sa_family_t for BSD compatibiliy
Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
Diff:
---
newlib/libc/include/sys/_types.h | 4 ++++
winsup/cygwin/include/cygwin/socket.h | 2 +-
winsup/cygwin/include/machine/_types.h | 3 +++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h
index 37154ff..1c08d9f 100644
--- a/newlib/libc/include/sys/_types.h
+++ b/newlib/libc/include/sys/_types.h
@@ -188,6 +188,10 @@ typedef _CLOCKID_T_ __clockid_t;
#define _TIMER_T_ unsigned long
typedef _TIMER_T_ __timer_t;
+#ifndef __machine_sa_family_t_defined
+typedef __uint8_t __sa_family_t;
+#endif
+
#ifndef __machine_socklen_t_defined
typedef __uint32_t __socklen_t;
#endif
diff --git a/winsup/cygwin/include/cygwin/socket.h b/winsup/cygwin/include/cygwin/socket.h
index b82b085..5892714 100644
--- a/winsup/cygwin/include/cygwin/socket.h
+++ b/winsup/cygwin/include/cygwin/socket.h
@@ -24,7 +24,7 @@ typedef __socklen_t socklen_t;
#define socklen_t socklen_t
#endif
-typedef uint16_t sa_family_t;
+typedef __sa_family_t sa_family_t;
#ifndef __INSIDE_CYGWIN_NET__
struct sockaddr {
diff --git a/winsup/cygwin/include/machine/_types.h b/winsup/cygwin/include/machine/_types.h
index ee1a6c6..e6ed313 100644
--- a/winsup/cygwin/include/machine/_types.h
+++ b/winsup/cygwin/include/machine/_types.h
@@ -42,6 +42,9 @@ typedef __uint64_t __ino_t;
#define __machine_key_t_defined
typedef long long __key_t;
+#define __machine_sa_family_t_defined
+typedef __uint16_t __sa_family_t;
+
/* Not unsigned for backward compatibility. */
#define __machine_socklen_t_defined
typedef int __socklen_t;