diff --git a/ChangeLog b/ChangeLog index ab51a35d6..0fe690fb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-11-24 Matthias Clasen + + * glib/gutils.c: Remove leftover ENABLE_NLS #ifdefs. + 2007-11-23 Matthias Clasen * glib/gbase64.c (g_base64_encode): Don't refuse to encode diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index dfd71f306..badac7759 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -624,10 +624,10 @@ g_ascii_formatd (gchar *buffer, } static guint64 -g_parse_long_long (const gchar *nptr, - gchar **endptr, - guint base, - gboolean *negative) +g_parse_long_long (const gchar *nptr, + gchar **endptr, + guint base, + gboolean *negative) { /* this code is based on on the strtol(3) code from GNU libc released under * the GNU Lesser General Public License.