package/graphic/magicpoint/hotfix-gcc34.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../magicpoint/gcc34.patch
   5 # Copyright (C) 2004 - 2005 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 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 The usual problematic code cought by gcc >= 3.4.x
  18
  19   - Rene Rebe <rene@exactcode.de>
  20
  21 --- ./mng.c.orig        2004-05-14 11:27:46.980807688 +0200
  22 +++ ./mng.c     2004-09-25 12:39:35.849095864 +0200
  23 @@ -43,7 +43,7 @@
  24         mng_uint32      delay;     /* ticks to wait before resuming decode */
  25  } mngstuff;
  26
  27 -void mng_window_setup __P((mngstuff *mymng, int x, int y, int width, int height));
  28 +int mng_window_setup __P((mngstuff *mymng, int x, int y, int width, int height));
  29
  30  /* callbacks for the mng decoder */
  31
  32 @@ -218,7 +218,7 @@
  33         mymng = (mngstuff*)mng_get_userdata(mng);
  34
  35         /* pull out the chuck type as a string */
  36 -       // FIXME: does this assume unsigned char?
  37 +       /* FIXME: does this assume unsigned char? */
  38         chunk[0] = (char)((chunktype >> 24) & 0xFF);
  39         chunk[1] = (char)((chunktype >> 16) & 0xFF);
  40         chunk[2] = (char)((chunktype >>  8) & 0xFF);
  41 @@ -319,7 +319,7 @@
  42         }
  43  }
  44
  45 -void
  46 +int
  47  mng_window_setup(mymng, x, y, width, height)
  48         mngstuff        *mymng;
  49         int x, y;
  50 --- ./scanner.l.orig    2004-05-14 11:25:56.259639864 +0200
  51 +++ ./scanner.l 2004-05-14 11:26:57.899269216 +0200
  52 @@ -59,7 +59,7 @@
  53  #include "tokdefs.h"
  54
  55  static int stoi __P((char *));
  56 -static inline int xdtoi __P((int));
  57 +static int xdtoi __P((int));
  58
  59  #ifdef FLEX_SCANNER
  60  #define YY_NO_UNPUT
  61 @@ -202,7 +202,7 @@
  62  }
  63
  64  /* Hex digit to integer. */
  65 -static inline int
  66 +static int
  67  xdtoi(c)
  68         register int c;
  69  {