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