filename | android/deps/glib-2.26.0.diff |
changeset | 1239:be3121267597 |
author | nkeynes |
date | Mon Mar 05 11:41:03 2012 +1000 (12 years ago) |
permissions | -rw-r--r-- |
last change | Small cleanups: Refactor the post-windowing setup into gl_init_driver() in video_gl.c Move gl_sl.c into src/drivers and tidy up a bit. Fix OS X compiling plugins with -mdynamic-no-pic |
file | annotate | diff | log | raw |
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +00001.2 +++ b/android/deps/glib-2.26.0.diff Mon Mar 05 11:41:03 2012 +10001.3 @@ -0,0 +1,57 @@1.4 +diff -ur glib-2.26.0/glib/gstrfuncs.c glib-2.26.0/glib/gstrfuncs.c1.5 +--- glib-2.26.0/glib/gstrfuncs.c 2010-09-14 01:57:51.000000000 +10001.6 ++++ glib-2.26.0/glib/gstrfuncs.c 2012-02-16 17:36:27.000000000 +10001.7 +@@ -442,8 +442,12 @@1.8 +1.9 + fail_pos = NULL;1.10 +1.11 ++#ifdef __ANDROID__1.12 ++ decimal_point = ".";1.13 ++#else1.14 + locale_data = localeconv ();1.15 + decimal_point = locale_data->decimal_point;1.16 ++#endif1.17 + decimal_point_len = strlen (decimal_point);1.18 +1.19 + g_assert (decimal_point_len != 0);1.20 +@@ -656,8 +660,12 @@1.21 +1.22 + _g_snprintf (buffer, buf_len, format, d);1.23 +1.24 ++#ifdef __ANDROID__1.25 ++ decimal_point = ".";1.26 ++#else1.27 + locale_data = localeconv ();1.28 + decimal_point = locale_data->decimal_point;1.29 ++#endif1.30 + decimal_point_len = strlen (decimal_point);1.31 +1.32 + g_assert (decimal_point_len != 0);1.33 +diff -ur glib-2.26.0/glib/gutils.c glib-2.26.0/glib/gutils.c1.34 +--- glib-2.26.0/glib/gutils.c 2010-09-14 01:57:51.000000000 +10001.35 ++++ glib-2.26.0/glib/gutils.c 2012-02-16 17:35:33.000000000 +10001.36 +@@ -1694,14 +1694,12 @@1.37 +1.38 + if (!pw)1.39 + {1.40 +- setpwent ();1.41 + pw = getpwuid (getuid ());1.42 +- endpwent ();1.43 + }1.44 + if (pw)1.45 + {1.46 + g_user_name = g_strdup (pw->pw_name);1.47 +-1.48 ++#ifndef __ANDROID__1.49 + if (pw->pw_gecos && *pw->pw_gecos != '\0')1.50 + {1.51 + gchar **gecos_fields;1.52 +@@ -1715,7 +1713,7 @@1.53 + g_strfreev (gecos_fields);1.54 + g_strfreev (name_parts);1.55 + }1.56 +-1.57 ++#endif1.58 + if (!g_home_dir)1.59 + g_home_dir = g_strdup (pw->pw_dir);1.60 + }
.