lxdream 0.9.1| filename | android/deps/gettext-0.18.1.1.diff |
| changeset | 1239:be3121267597 |
| author | nkeynes |
| date | Fri Mar 02 23:49:10 2012 +1000 (12 years ago) |
| permissions | -rw-r--r-- |
| last change | Android WIP: * Rename gui_jni.c to gui_android.c - now quite android specific. * Implement generic EGL driver with very minimal Java wrapper * Run emulation in separate thread, and implement simple queue for inter-thread communication. * Add menu/action-bar items for start + reset |
| view | annotate | diff | log | raw |
1 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
2 --- gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdint.in.h 2010-04-25 19:20:42.000000000 +1000
3 +++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdint.in.h 2012-02-16 09:06:32.000000000 +1000
4 @@ -33,6 +33,13 @@
5 <inttypes.h>. */
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@
13 +#else
14 +
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
18 @@ -566,3 +573,4 @@
20 #endif /* _GL_STDINT_H */
21 #endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
22 +#endif /* !(defined __ANDROID__) */
23 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
24 --- gettext-0.18.1.1/gettext-tools/gnulib-lib/stdint.in.h 2010-05-24 19:42:46.000000000 +1000
25 +++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdint.in.h 2012-02-16 09:06:53.000000000 +1000
26 @@ -33,6 +33,13 @@
27 <inttypes.h>. */
28 #define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
30 +/* On Android (Bionic libc), <sys/types.h> includes this file before
31 + having defined 'time_t'. Therefore in this case avoid including
32 + other system header files; just include the system's <stdint.h>. */
33 +#if defined __ANDROID__
34 +# @INCLUDE_NEXT@ @NEXT_STDINT_H@
35 +#else
36 +
37 /* Get those types that are already defined in other system include
38 files, so that we can "#define int8_t signed char" below without
39 worrying about a later system include file containing a "typedef
40 @@ -566,3 +573,4 @@
42 #endif /* _GL_STDINT_H */
43 #endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
44 +#endif /* !(defined __ANDROID__) */
45 diff -ur gettext-0.18.1.1/gettext-tools/libgettextpo/stdint.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/stdint.in.h
46 --- gettext-0.18.1.1/gettext-tools/libgettextpo/stdint.in.h 2010-04-25 19:22:40.000000000 +1000
47 +++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdint.in.h 2012-02-16 09:07:10.000000000 +1000
48 @@ -33,6 +33,13 @@
49 <inttypes.h>. */
50 #define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
52 +/* On Android (Bionic libc), <sys/types.h> includes this file before
53 + having defined 'time_t'. Therefore in this case avoid including
54 + other system header files; just include the system's <stdint.h>. */
55 +#if defined __ANDROID__
56 +# @INCLUDE_NEXT@ @NEXT_STDINT_H@
57 +#else
58 +
59 /* Get those types that are already defined in other system include
60 files, so that we can "#define int8_t signed char" below without
61 worrying about a later system include file containing a "typedef
62 @@ -566,3 +573,4 @@
64 #endif /* _GL_STDINT_H */
65 #endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
66 +#endif /* !(defined __ANDROID__) */
67 diff -ur gettext-0.18.1.1/gettext-tools/libgrep/nl_langinfo.c gettext-0.18.1.1/gettext-tools/libgrep/nl_langinfo.c
68 --- gettext-0.18.1.1/gettext-tools/libgrep/nl_langinfo.c 2010-05-25 00:49:26.000000000 +1000
69 +++ gettext-0.18.1.1/gettext-tools/libgrep/nl_langinfo.c 2012-02-16 17:42:53.000000000 +1000
70 @@ -142,9 +142,17 @@
71 # endif
72 /* nl_langinfo items of the LC_NUMERIC category */
73 case RADIXCHAR:
74 +#ifdef __ANDROID__
75 + return ".";
76 +#else
77 return localeconv () ->decimal_point;
78 +#endif
79 case THOUSEP:
80 +#ifdef __ANDROID__
81 + return ",";
82 +#else
83 return localeconv () ->thousands_sep;
84 +#endif
85 /* nl_langinfo items of the LC_TIME category.
86 TODO: Really use the locale. */
87 case D_T_FMT:
88 diff -ur gettext-0.18.1.1/gettext-tools/src/msginit.c gettext-0.18.1.1/gettext-tools/src/msginit.c
89 --- gettext-0.18.1.1/gettext-tools/src/msginit.c 2010-06-06 22:49:58.000000000 +1000
90 +++ gettext-0.18.1.1/gettext-tools/src/msginit.c 2012-02-16 17:44:33.000000000 +1000
91 @@ -1081,7 +1081,11 @@
92 char *result;
94 /* Return the pw_gecos field, upto the first comma (if any). */
95 +#ifdef __ANDROID__
96 + fullname = pwd->pw_name;
97 +#else
98 fullname = pwd->pw_gecos;
99 +#endif
100 fullname_end = strchr (fullname, ',');
101 if (fullname_end == NULL)
102 fullname_end = fullname + strlen (fullname);
.