am 4d71adbc: am 10225071: Merge "Fixes x86 build."

* commit '4d71adbc0d12e5153f537f84cce8d9686762e5b9':
  Fixes x86 build.
This commit is contained in:
Elliott Hughes 2012-10-18 13:58:18 -07:00 committed by Android Git Automerger
commit 0f7814264c

View File

@ -2241,7 +2241,7 @@ time_t t;
#endif /* defined STD_INSPIRED */ #endif /* defined STD_INSPIRED */
#include <stdint.h> #include <stdint.h>
#include <sys/endian.h> #include <arpa/inet.h> // For ntohl(3).
static int __bionic_open_tzdata(const char* olson_id, int* data_size) { static int __bionic_open_tzdata(const char* olson_id, int* data_size) {
int fd = TEMP_FAILURE_RETRY(open(TZDATA_PATH, OPEN_MODE)); int fd = TEMP_FAILURE_RETRY(open(TZDATA_PATH, OPEN_MODE));