# --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # T2 SDE: package/.../magicpoint/gcc34.patch # Copyright (C) 2004 - 2005 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 problematic code cought by gcc >= 3.4.x - Rene Rebe --- ./mng.c.orig 2004-05-14 11:27:46.980807688 +0200 +++ ./mng.c 2004-09-25 12:39:35.849095864 +0200 @@ -43,7 +43,7 @@ mng_uint32 delay; /* ticks to wait before resuming decode */ } mngstuff; -void mng_window_setup __P((mngstuff *mymng, int x, int y, int width, int height)); +int mng_window_setup __P((mngstuff *mymng, int x, int y, int width, int height)); /* callbacks for the mng decoder */ @@ -218,7 +218,7 @@ mymng = (mngstuff*)mng_get_userdata(mng); /* pull out the chuck type as a string */ - // FIXME: does this assume unsigned char? + /* FIXME: does this assume unsigned char? */ chunk[0] = (char)((chunktype >> 24) & 0xFF); chunk[1] = (char)((chunktype >> 16) & 0xFF); chunk[2] = (char)((chunktype >> 8) & 0xFF); @@ -319,7 +319,7 @@ } } -void +int mng_window_setup(mymng, x, y, width, height) mngstuff *mymng; int x, y; --- ./scanner.l.orig 2004-05-14 11:25:56.259639864 +0200 +++ ./scanner.l 2004-05-14 11:26:57.899269216 +0200 @@ -59,7 +59,7 @@ #include "tokdefs.h" static int stoi __P((char *)); -static inline int xdtoi __P((int)); +static int xdtoi __P((int)); #ifdef FLEX_SCANNER #define YY_NO_UNPUT @@ -202,7 +202,7 @@ } /* Hex digit to integer. */ -static inline int +static int xdtoi(c) register int c; {