Search
lxdream.org :: lxdream/android/deps/gettext-0.18.1.1.diff :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename android/deps/gettext-0.18.1.1.diff
changeset 1239:be3121267597
author nkeynes
date Sat Feb 25 21:30:49 2012 +1000 (7 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/gettext-0.18.1.1.diff Sat Feb 25 21:30:49 2012 +1000
1.3 @@ -0,0 +1,102 @@
1.4 +diff -ur gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdint.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdint.in.h
1.5 +--- gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdint.in.h 2010-04-25 19:20:42.000000000 +1000
1.6 ++++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdint.in.h 2012-02-16 09:06:32.000000000 +1000
1.7 +@@ -33,6 +33,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 +@@ -566,3 +573,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 /* !(defined __ANDROID__) */
1.26 +diff -ur gettext-0.18.1.1/gettext-tools/gnulib-lib/stdint.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/stdint.in.h
1.27 +--- gettext-0.18.1.1/gettext-tools/gnulib-lib/stdint.in.h 2010-05-24 19:42:46.000000000 +1000
1.28 ++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdint.in.h 2012-02-16 09:06:53.000000000 +1000
1.29 +@@ -33,6 +33,13 @@
1.30 + <inttypes.h>. */
1.31 + #define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
1.32 +
1.33 ++/* On Android (Bionic libc), <sys/types.h> includes this file before
1.34 ++ having defined 'time_t'. Therefore in this case avoid including
1.35 ++ other system header files; just include the system's <stdint.h>. */
1.36 ++#if defined __ANDROID__
1.37 ++# @INCLUDE_NEXT@ @NEXT_STDINT_H@
1.38 ++#else
1.39 ++
1.40 + /* Get those types that are already defined in other system include
1.41 + files, so that we can "#define int8_t signed char" below without
1.42 + worrying about a later system include file containing a "typedef
1.43 +@@ -566,3 +573,4 @@
1.44 +
1.45 + #endif /* _GL_STDINT_H */
1.46 + #endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
1.47 ++#endif /* !(defined __ANDROID__) */
1.48 +diff -ur gettext-0.18.1.1/gettext-tools/libgettextpo/stdint.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/stdint.in.h
1.49 +--- gettext-0.18.1.1/gettext-tools/libgettextpo/stdint.in.h 2010-04-25 19:22:40.000000000 +1000
1.50 ++++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdint.in.h 2012-02-16 09:07:10.000000000 +1000
1.51 +@@ -33,6 +33,13 @@
1.52 + <inttypes.h>. */
1.53 + #define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
1.54 +
1.55 ++/* On Android (Bionic libc), <sys/types.h> includes this file before
1.56 ++ having defined 'time_t'. Therefore in this case avoid including
1.57 ++ other system header files; just include the system's <stdint.h>. */
1.58 ++#if defined __ANDROID__
1.59 ++# @INCLUDE_NEXT@ @NEXT_STDINT_H@
1.60 ++#else
1.61 ++
1.62 + /* Get those types that are already defined in other system include
1.63 + files, so that we can "#define int8_t signed char" below without
1.64 + worrying about a later system include file containing a "typedef
1.65 +@@ -566,3 +573,4 @@
1.66 +
1.67 + #endif /* _GL_STDINT_H */
1.68 + #endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
1.69 ++#endif /* !(defined __ANDROID__) */
1.70 +diff -ur gettext-0.18.1.1/gettext-tools/libgrep/nl_langinfo.c gettext-0.18.1.1/gettext-tools/libgrep/nl_langinfo.c
1.71 +--- gettext-0.18.1.1/gettext-tools/libgrep/nl_langinfo.c 2010-05-25 00:49:26.000000000 +1000
1.72 ++++ gettext-0.18.1.1/gettext-tools/libgrep/nl_langinfo.c 2012-02-16 17:42:53.000000000 +1000
1.73 +@@ -142,9 +142,17 @@
1.74 + # endif
1.75 + /* nl_langinfo items of the LC_NUMERIC category */
1.76 + case RADIXCHAR:
1.77 ++#ifdef __ANDROID__
1.78 ++ return ".";
1.79 ++#else
1.80 + return localeconv () ->decimal_point;
1.81 ++#endif
1.82 + case THOUSEP:
1.83 ++#ifdef __ANDROID__
1.84 ++ return ",";
1.85 ++#else
1.86 + return localeconv () ->thousands_sep;
1.87 ++#endif
1.88 + /* nl_langinfo items of the LC_TIME category.
1.89 + TODO: Really use the locale. */
1.90 + case D_T_FMT:
1.91 +diff -ur gettext-0.18.1.1/gettext-tools/src/msginit.c gettext-0.18.1.1/gettext-tools/src/msginit.c
1.92 +--- gettext-0.18.1.1/gettext-tools/src/msginit.c 2010-06-06 22:49:58.000000000 +1000
1.93 ++++ gettext-0.18.1.1/gettext-tools/src/msginit.c 2012-02-16 17:44:33.000000000 +1000
1.94 +@@ -1081,7 +1081,11 @@
1.95 + char *result;
1.96 +
1.97 + /* Return the pw_gecos field, upto the first comma (if any). */
1.98 ++#ifdef __ANDROID__
1.99 ++ fullname = pwd->pw_name;
1.100 ++#else
1.101 + fullname = pwd->pw_gecos;
1.102 ++#endif
1.103 + fullname_end = strchr (fullname, ',');
1.104 + if (fullname_end == NULL)
1.105 + fullname_end = fullname + strlen (fullname);
.