gnome14/glib12/gcc34.patch

   1 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # Filename: package/.../glib12/gcc34.patch
   5 # Copyright (C) 2004 - 2006 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- SDE-COPYRIGHT-NOTE-END ---
  16
  17 The usual gcc-3.4 fixes.
  18
  19   - Rene Rebe <rene@exactcode.de>
  20
  21 diff -ur glib-1.2.10-orig/gstrfuncs.c glib-1.2.10/gstrfuncs.c
  22 --- glib-1.2.10-orig/gstrfuncs.c        2001-02-27 07:00:22.000000000 +0100
  23 +++ glib-1.2.10/gstrfuncs.c     2004-05-04 16:05:28.000000000 +0200
  24 @@ -867,8 +867,7 @@
  25                    /* beware of positional parameters
  26                     */
  27                  case '$':
  28 -                  g_warning (G_GNUC_PRETTY_FUNCTION
  29 -                             "(): unable to handle positional parameters (%%n$)");
  30 +                  g_warning ("%s(): unable to handle positional parameters (%%n$), G_GNUC_PRETTY_FUNCTION");
  31                    len += 1024; /* try adding some safety padding */
  32                    break;
  33
  34 @@ -1034,8 +1033,7 @@
  35                    /*          n   .   dddddddddddddddddddddddd   E   +-  eeee */
  36                    conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
  37                    if (spec.mod_extra_long)
  38 -                    g_warning (G_GNUC_PRETTY_FUNCTION
  39 -                               "(): unable to handle long double, collecting double only");
  40 +                    g_warning ("%s(): unable to handle long double, collecting double only", G_GNUC_PRETTY_FUNCTION);
  41  #ifdef HAVE_LONG_DOUBLE
  42  #error need to implement special handling for long double
  43  #endif
  44 @@ -1077,8 +1075,7 @@
  45                    conv_done = TRUE;
  46                    if (spec.mod_long)
  47                      {
  48 -                      g_warning (G_GNUC_PRETTY_FUNCTION
  49 -                                 "(): unable to handle wide char strings");
  50 +                      g_warning ("%s(): unable to handle wide char strings", G_GNUC_PRETTY_FUNCTION);
  51                        len += 1024; /* try adding some safety padding */
  52                      }
  53                    break;
  54 @@ -1108,8 +1105,8 @@
  55                    conv_len += format - spec_start;
  56                    break;
  57                  default:
  58 -                  g_warning (G_GNUC_PRETTY_FUNCTION
  59 -                             "(): unable to handle `%c' while parsing format",
  60 +                  g_warning ("%s(): unable to handle `%c' while parsing format",
  61 +                            G_GNUC_PRETTY_FUNCTION,
  62                               c);
  63                    break;
  64                  }