OpenSDE Packages Database (without history before r20070)
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.

69 lines
2.0 KiB

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