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