Annotation of /trunk/glib1/patches/glib1-1.2.10-gcc34.patch
Parent Directory | Revision Log
Revision 144 -
(hide annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 2008 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 2008 byte(s)
-import
1 | niro | 144 | --- glib-1.2.10/gstrfuncs.c.orig 2001-02-27 07:00:22.000000000 +0100 |
2 | +++ glib-1.2.10/gstrfuncs.c 2004-03-01 13:19:49.531603760 +0100 | ||
3 | @@ -867,7 +867,7 @@ | ||
4 | /* beware of positional parameters | ||
5 | */ | ||
6 | case '$': | ||
7 | - g_warning (G_GNUC_PRETTY_FUNCTION | ||
8 | + g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION, | ||
9 | "(): unable to handle positional parameters (%%n$)"); | ||
10 | len += 1024; /* try adding some safety padding */ | ||
11 | break; | ||
12 | @@ -1034,7 +1034,7 @@ | ||
13 | /* n . dddddddddddddddddddddddd E +- eeee */ | ||
14 | conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4; | ||
15 | if (spec.mod_extra_long) | ||
16 | - g_warning (G_GNUC_PRETTY_FUNCTION | ||
17 | + g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION, | ||
18 | "(): unable to handle long double, collecting double only"); | ||
19 | #ifdef HAVE_LONG_DOUBLE | ||
20 | #error need to implement special handling for long double | ||
21 | @@ -1077,7 +1077,7 @@ | ||
22 | conv_done = TRUE; | ||
23 | if (spec.mod_long) | ||
24 | { | ||
25 | - g_warning (G_GNUC_PRETTY_FUNCTION | ||
26 | + g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION, | ||
27 | "(): unable to handle wide char strings"); | ||
28 | len += 1024; /* try adding some safety padding */ | ||
29 | } | ||
30 | @@ -1108,9 +1108,8 @@ | ||
31 | conv_len += format - spec_start; | ||
32 | break; | ||
33 | default: | ||
34 | - g_warning (G_GNUC_PRETTY_FUNCTION | ||
35 | - "(): unable to handle `%c' while parsing format", | ||
36 | - c); | ||
37 | + g_warning ("%s(): unable to handle `%c' while parsing format", | ||
38 | + G_GNUC_PRETTY_FUNCTION, c); | ||
39 | break; | ||
40 | } | ||
41 | conv_done |= conv_len > 0; |