am e7b1e0e2: am e74fc3a6: Merge "Fix socklen_t (on LP64 only)."

* commit 'e7b1e0e2919c65f352f4bf89cc4eb93151873453':
  Fix socklen_t (on LP64 only).
This commit is contained in:
Elliott Hughes 2014-02-10 12:50:51 +00:00 committed by Android Git Automerger
commit db8e3c7dd2

View File

@ -111,7 +111,13 @@ typedef .... pthread_rwlock_attr_t;
typedef .... pthread_t;
#endif
#if !defined(__LP64__)
/* This historical accident means that we had a signed socklen_t on 32-bit architectures. */
typedef __int32_t __socklen_t;
#else
/* LP64 still has a 32-bit socklen_t. */
typedef __uint32_t __socklen_t;
#endif
typedef __socklen_t socklen_t;
typedef __builtin_va_list __va_list;