Search
lxdream.org :: lxdream/android/deps/glib-2.26.0.diff
lxdream 0.9.1
released Jun 29
Download Now
filename android/deps/glib-2.26.0.diff
changeset 1239:be3121267597
author nkeynes
date Sun Mar 04 20:55:31 2012 +1000 (12 years ago)
permissions -rw-r--r--
last change Set min-sdk to gingerbread, but target honeycomb (for the action bar)
file annotate diff log raw
nkeynes@1239
     1
diff -ur glib-2.26.0/glib/gstrfuncs.c glib-2.26.0/glib/gstrfuncs.c
nkeynes@1239
     2
--- glib-2.26.0/glib/gstrfuncs.c	2010-09-14 01:57:51.000000000 +1000
nkeynes@1239
     3
+++ glib-2.26.0/glib/gstrfuncs.c	2012-02-16 17:36:27.000000000 +1000
nkeynes@1239
     4
@@ -442,8 +442,12 @@
nkeynes@1239
     5
 
nkeynes@1239
     6
   fail_pos = NULL;
nkeynes@1239
     7
 
nkeynes@1239
     8
+#ifdef __ANDROID__
nkeynes@1239
     9
+  decimal_point = ".";
nkeynes@1239
    10
+#else
nkeynes@1239
    11
   locale_data = localeconv ();
nkeynes@1239
    12
   decimal_point = locale_data->decimal_point;
nkeynes@1239
    13
+#endif
nkeynes@1239
    14
   decimal_point_len = strlen (decimal_point);
nkeynes@1239
    15
 
nkeynes@1239
    16
   g_assert (decimal_point_len != 0);
nkeynes@1239
    17
@@ -656,8 +660,12 @@
nkeynes@1239
    18
 
nkeynes@1239
    19
   _g_snprintf (buffer, buf_len, format, d);
nkeynes@1239
    20
 
nkeynes@1239
    21
+#ifdef __ANDROID__
nkeynes@1239
    22
+  decimal_point = ".";
nkeynes@1239
    23
+#else
nkeynes@1239
    24
   locale_data = localeconv ();
nkeynes@1239
    25
   decimal_point = locale_data->decimal_point;
nkeynes@1239
    26
+#endif
nkeynes@1239
    27
   decimal_point_len = strlen (decimal_point);
nkeynes@1239
    28
 
nkeynes@1239
    29
   g_assert (decimal_point_len != 0);
nkeynes@1239
    30
diff -ur glib-2.26.0/glib/gutils.c glib-2.26.0/glib/gutils.c
nkeynes@1239
    31
--- glib-2.26.0/glib/gutils.c	2010-09-14 01:57:51.000000000 +1000
nkeynes@1239
    32
+++ glib-2.26.0/glib/gutils.c	2012-02-16 17:35:33.000000000 +1000
nkeynes@1239
    33
@@ -1694,14 +1694,12 @@
nkeynes@1239
    34
     
nkeynes@1239
    35
     if (!pw)
nkeynes@1239
    36
       {
nkeynes@1239
    37
-	setpwent ();
nkeynes@1239
    38
 	pw = getpwuid (getuid ());
nkeynes@1239
    39
-	endpwent ();
nkeynes@1239
    40
       }
nkeynes@1239
    41
     if (pw)
nkeynes@1239
    42
       {
nkeynes@1239
    43
 	g_user_name = g_strdup (pw->pw_name);
nkeynes@1239
    44
-
nkeynes@1239
    45
+#ifndef __ANDROID__
nkeynes@1239
    46
 	if (pw->pw_gecos && *pw->pw_gecos != '\0') 
nkeynes@1239
    47
 	  {
nkeynes@1239
    48
 	    gchar **gecos_fields;
nkeynes@1239
    49
@@ -1715,7 +1713,7 @@
nkeynes@1239
    50
 	    g_strfreev (gecos_fields);
nkeynes@1239
    51
 	    g_strfreev (name_parts);
nkeynes@1239
    52
 	  }
nkeynes@1239
    53
-
nkeynes@1239
    54
+#endif
nkeynes@1239
    55
 	if (!g_home_dir)
nkeynes@1239
    56
 	  g_home_dir = g_strdup (pw->pw_dir);
nkeynes@1239
    57
       }
.