You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
65 lines
2.9 KiB
65 lines
2.9 KiB
18 years ago
|
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# T2 SDE: package/.../glib12/gcc34.patch
|
||
|
|
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- T2-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
The usual gcc-3.4 fixes.
|
||
|
|
|
||
|
|
- Rene Rebe <rene@exactcode.de>
|
||
|
|
|
||
|
|
diff -ur glib-1.2.10-orig/gstrfuncs.c glib-1.2.10/gstrfuncs.c
|
||
|
|
--- glib-1.2.10-orig/gstrfuncs.c 2001-02-27 07:00:22.000000000 +0100
|
||
|
|
+++ glib-1.2.10/gstrfuncs.c 2004-05-04 16:05:28.000000000 +0200
|
||
|
|
@@ -867,8 +867,7 @@
|
||
|
|
/* beware of positional parameters
|
||
|
|
*/
|
||
|
|
case '$':
|
||
|
|
- g_warning (G_GNUC_PRETTY_FUNCTION
|
||
|
|
- "(): unable to handle positional parameters (%%n$)");
|
||
|
|
+ g_warning ("%s(): unable to handle positional parameters (%%n$), G_GNUC_PRETTY_FUNCTION");
|
||
|
|
len += 1024; /* try adding some safety padding */
|
||
|
|
break;
|
||
|
|
|
||
|
|
@@ -1034,8 +1033,7 @@
|
||
|
|
/* n . dddddddddddddddddddddddd E +- eeee */
|
||
|
|
conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
|
||
|
|
if (spec.mod_extra_long)
|
||
|
|
- g_warning (G_GNUC_PRETTY_FUNCTION
|
||
|
|
- "(): unable to handle long double, collecting double only");
|
||
|
|
+ g_warning ("%s(): unable to handle long double, collecting double only", G_GNUC_PRETTY_FUNCTION);
|
||
|
|
#ifdef HAVE_LONG_DOUBLE
|
||
|
|
#error need to implement special handling for long double
|
||
|
|
#endif
|
||
|
|
@@ -1077,8 +1075,7 @@
|
||
|
|
conv_done = TRUE;
|
||
|
|
if (spec.mod_long)
|
||
|
|
{
|
||
|
|
- g_warning (G_GNUC_PRETTY_FUNCTION
|
||
|
|
- "(): unable to handle wide char strings");
|
||
|
|
+ g_warning ("%s(): unable to handle wide char strings", G_GNUC_PRETTY_FUNCTION);
|
||
|
|
len += 1024; /* try adding some safety padding */
|
||
|
|
}
|
||
|
|
break;
|
||
|
|
@@ -1108,8 +1105,8 @@
|
||
|
|
conv_len += format - spec_start;
|
||
|
|
break;
|
||
|
|
default:
|
||
|
|
- g_warning (G_GNUC_PRETTY_FUNCTION
|
||
|
|
- "(): unable to handle `%c' while parsing format",
|
||
|
|
+ g_warning ("%s(): unable to handle `%c' while parsing format",
|
||
|
|
+ G_GNUC_PRETTY_FUNCTION,
|
||
|
|
c);
|
||
|
|
break;
|
||
|
|
}
|