1 diff -ur libiconv-1.13.1/srclib/stdint.in.h /Users/nkeynes/src/libiconv-1.13.1/srclib/stdint.in.h
2 --- libiconv-1.13.1-orig/srclib/stdint.in.h 2009-06-21 21:31:08.000000000 +1000
3 +++ libiconv-1.13.1/srclib/stdint.in.h 2012-02-16 09:57:24.000000000 +1000
6 #define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
8 +/* On Android (Bionic libc), <sys/types.h> includes this file before
9 + having defined 'time_t'. Therefore in this case avoid including
10 + other system header files; just include the system's <stdint.h>. */
11 +#if defined __ANDROID__
12 +# @INCLUDE_NEXT@ @NEXT_STDINT_H@
15 /* Get those types that are already defined in other system include
16 files, so that we can "#define int8_t signed char" below without
17 worrying about a later system include file containing a "typedef
20 #endif /* _GL_STDINT_H */
21 #endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
22 +#endif /* !__ANDROID__ */
23 \ No newline at end of file
.