commit 508d292f8deb2933914b0ceef56908cdd4ee589f
author Elliott Hughes <enh@google.com> Thu Jul 21 16:38:43 2016 -0700
committer Elliott Hughes <enh@google.com> Thu Jul 21 16:38:43 2016 -0700
tree e740e08d5709b42c3198d9345771dfc2f9903fd5
parent 91f33cd5ae3f09b7d2e614f5d0809037c1708db1

Only define sa_family_t once.

Change-Id: Icf700910c836d22c8a27ad026ec8af11697edd5a

libc/include/sys/socket.h

diff --git a/libc/include/sys/socket.h b/libc/include/sys/socket.h
index 85999f3..9736ba8 100644
--- a/libc/include/sys/socket.h
+++ b/libc/include/sys/socket.h
@@ -40,10 +40,11 @@
 #include <linux/types.h>
 #include <linux/compiler.h>
 
+#include <bits/sa_family_t.h>
+
 __BEGIN_DECLS
 
 #define sockaddr_storage __kernel_sockaddr_storage
-typedef unsigned short sa_family_t;
 
 struct timespec;
 

libc/include/sys/un.h

diff --git a/libc/include/sys/un.h b/libc/include/sys/un.h
index 65ffbdcf..421b900 100644
--- a/libc/include/sys/un.h
+++ b/libc/include/sys/un.h
@@ -25,11 +25,11 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
 #ifndef _SYS_UN_H_
 #define _SYS_UN_H_
 
-typedef unsigned short sa_family_t;
-
+#include <bits/sa_family_t.h>
 #include <linux/un.h>
 
-#endif /* _SYS_UN_H_ */
+#endif