Search
lxdream.org :: lxdream/android/deps/libiconv-1.13.1.diff :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename android/deps/libiconv-1.13.1.diff
changeset 1239:be3121267597
author nkeynes
date Sat Feb 25 21:30:49 2012 +1000 (10 years ago)
permissions -rw-r--r--
last change Android support WIP
file annotate diff log raw
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/android/deps/libiconv-1.13.1.diff Sat Feb 25 21:30:49 2012 +1000
1.3 @@ -0,0 +1,23 @@
1.4 +diff -ur libiconv-1.13.1/srclib/stdint.in.h /Users/nkeynes/src/libiconv-1.13.1/srclib/stdint.in.h
1.5 +--- libiconv-1.13.1-orig/srclib/stdint.in.h 2009-06-21 21:31:08.000000000 +1000
1.6 ++++ libiconv-1.13.1/srclib/stdint.in.h 2012-02-16 09:57:24.000000000 +1000
1.7 +@@ -29,6 +29,13 @@
1.8 + <inttypes.h>. */
1.9 + #define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
1.10 +
1.11 ++/* On Android (Bionic libc), <sys/types.h> includes this file before
1.12 ++ having defined 'time_t'. Therefore in this case avoid including
1.13 ++ other system header files; just include the system's <stdint.h>. */
1.14 ++#if defined __ANDROID__
1.15 ++# @INCLUDE_NEXT@ @NEXT_STDINT_H@
1.16 ++#else
1.17 ++
1.18 + /* Get those types that are already defined in other system include
1.19 + files, so that we can "#define int8_t signed char" below without
1.20 + worrying about a later system include file containing a "typedef
1.21 +@@ -565,3 +572,4 @@
1.22 +
1.23 + #endif /* _GL_STDINT_H */
1.24 + #endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
1.25 ++#endif /* !__ANDROID__ */
1.26 +\ No newline at end of file
.