commit 90ae787b30890dc7d0f5d95b67ea5578d53bd61e
author Elliott Hughes <enh@google.com> Wed Sep 12 11:03:24 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 12 11:03:24 2012 -0700
tree 79dd4140a44a2ff914657c70d113017fa10ebfff
parent 7f798147980798718ac893229ae20dba9e3a26c7
parent 666d06fee9e1d2e1401a4b42d94d01e8f38ad1a5

am 666d06fe: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."

* commit '666d06fee9e1d2e1401a4b42d94d01e8f38ad1a5':
  Backwards and forwards compatibility for an upcoming <sys/socket.h> change.

libc/include/sys/un.h

diff --git a/libc/include/sys/un.h b/libc/include/sys/un.h
index 973861f..f89ead3 100644
--- a/libc/include/sys/un.h
+++ b/libc/include/sys/un.h
@@ -28,6 +28,9 @@
 #ifndef _SYS_UN_H_
 #define _SYS_UN_H_
 
+#include <sys/_types.h>
+typedef __sa_family_t sa_family_t;
+
 #include <linux/un.h>
 
 #endif /* _SYS_UN_H_ */