mirror of the now-defunct rocklinux.org
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.

59 lines
1.8 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/clifford/magicpoint/gcc34.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./mng.c.orig 2004-05-14 11:27:46.980807688 +0200
  20. +++ ./mng.c 2004-05-14 11:28:40.725637232 +0200
  21. @@ -216,7 +216,7 @@
  22. mymng = (mngstuff*)mng_get_userdata(mng);
  23. /* pull out the chuck type as a string */
  24. - // FIXME: does this assume unsigned char?
  25. + /* FIXME: does this assume unsigned char? */
  26. chunk[0] = (char)((chunktype >> 24) & 0xFF);
  27. chunk[1] = (char)((chunktype >> 16) & 0xFF);
  28. chunk[2] = (char)((chunktype >> 8) & 0xFF);
  29. @@ -317,7 +317,7 @@
  30. }
  31. }
  32. -void
  33. +int
  34. mng_window_setup(mymng, x, y, width, height)
  35. mngstuff *mymng;
  36. int x, y;
  37. --- ./scanner.l.orig 2004-05-14 11:25:56.259639864 +0200
  38. +++ ./scanner.l 2004-05-14 11:26:57.899269216 +0200
  39. @@ -59,7 +59,7 @@
  40. #include "tokdefs.h"
  41. static int stoi __P((char *));
  42. -static inline int xdtoi __P((int));
  43. +static int xdtoi __P((int));
  44. #ifdef FLEX_SCANNER
  45. #define YY_NO_UNPUT
  46. @@ -202,7 +202,7 @@
  47. }
  48. /* Hex digit to integer. */
  49. -static inline int
  50. +static int
  51. xdtoi(c)
  52. register int c;
  53. {