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

* commit 'ccd7ee624a81d61675fa08e149fe190a317341eb':
  Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
This commit is contained in:
Elliott Hughes 2012-09-12 11:08:30 -07:00 committed by Android Git Automerger
commit 7f59867170

View File

@ -28,6 +28,9 @@
#ifndef _SYS_UN_H_ #ifndef _SYS_UN_H_
#define _SYS_UN_H_ #define _SYS_UN_H_
#include <sys/_types.h>
typedef __sa_family_t sa_family_t;
#include <linux/un.h> #include <linux/un.h>
#endif /* _SYS_UN_H_ */ #endif /* _SYS_UN_H_ */