gmodplay/gcc-compile.patch

   1 --- cmdline/cmdline.cpp.prev    1998-10-03 14:29:20.000000000 +0300
   2 +++ cmdline/cmdline.cpp 2006-09-05 12:44:20.000000000 +0300
   3 @@ -12,7 +12,7 @@
   4  #include <stdio.h>
   5  #include <signal.h>
   6  #include <string.h>
   7 -
   8 +#include <stdlib.h>
   9
  10  #include "playlist.h"
  11  #include "modplay.h"
  12 @@ -213,7 +213,7 @@
  13         char *modfile;
  14
  15         _player = Player;
  16 -       Player->generic = new struct CmdInfo;
  17 +       Player->generic = new CmdInfo;
  18         CMD_INFO(Player)->first_visible_instrument = 0;
  19         CMD_INFO(Player)->last_visible_instrument = 0;
  20
  21 --- cmdline/cmdline.h.prev      1998-10-03 14:27:29.000000000 +0300
  22 +++ cmdline/cmdline.h   2006-09-05 12:39:42.000000000 +0300
  23 @@ -26,7 +26,7 @@
  24  #define _LINE_SPECTRO_BANDS_   (_LINE_SPECTRO_MIN_ + 1)
  25  #define _LINE_INSTRUMENTS_     (_LINE_SPECTRO_BANDS_ + 1)
  26
  27 -#define CMD_INFO(playerinfo)   ((struct CmdInfo*) playerinfo->generic)
  28 +#define CMD_INFO(playerinfo)   ((CmdInfo*) playerinfo->generic)
  29  typedef struct {
  30         int first_visible_instrument;
  31         int last_visible_instrument;
  32 --- common/devices.cpp.prev     1998-09-29 00:59:27.000000000 +0300
  33 +++ common/devices.cpp  2006-09-05 12:36:41.000000000 +0300
  34 @@ -11,6 +11,7 @@
  35  #include <sys/stat.h>
  36  #include <sys/mman.h>
  37  #include <unistd.h>
  38 +#include <stdlib.h>
  39  #include <fcntl.h>
  40  #include <stdio.h>
  41  #include <sys/ioctl.h>
  42 --- common/modfile.cpp.prev     1998-09-07 01:45:26.000000000 +0300
  43 +++ common/modfile.cpp  2006-09-05 12:37:47.000000000 +0300
  44 @@ -79,7 +79,7 @@
  45                 return -1;
  46         }
  47
  48 -       Mod->ptr = mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, Mod->fd, 0);
  49 +       Mod->ptr = (char *)mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, Mod->fd, 0);
  50         if ((int) *Mod->ptr == -1) {
  51                 Mod->ptr = NULL;
  52                 close(Mod->fd);
  53 --- common/playlist.cpp.prev    1998-09-16 07:20:34.000000000 +0300
  54 +++ common/playlist.cpp 2006-09-05 12:38:28.000000000 +0300
  55 @@ -56,7 +56,7 @@
  56         int i = 1;
  57         char *item;
  58
  59 -       while ((item = g_list_nth_data(List->modfiles, i++)) != NULL) {
  60 +       while ((item = (char *)g_list_nth_data(List->modfiles, i++)) != NULL) {
  61                 delete item;
  62         }
  63         g_list_free(List->modfiles);
  64 --- Makefile.prev       2006-09-05 12:35:58.000000000 +0300
  65 +++ Makefile    1998-10-05 11:36:12.000000000 +0300
  66 @@ -34,7 +34,7 @@
  67  SUBDIRS  = sndlib common
  68
  69  ifndef DEBUG
  70 -CFLAGS   += -fomit-frame-pointer -fforce-mem -fforce-addr
  71 +CFLAGS   += -fomit-frame-pointer -fforce-addr
  72  else
  73  CFLAGS   += -g -Wall
  74  ifdef DMALLOC