Convert some C99-isms to C89 to make this build with gcc 2.95.

5 files changed, 94 insertions, 17 deletions

diff --git a/emulators/gens/distinfo b/emulators/gens/distinfo
index e727dce827b..7f4a231eaec 100644
--- a/emulators/gens/distinfo
+++ b/emulators/gens/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/08/15 12:13:53 dillo Exp $
+$NetBSD: distinfo,v 1.3 2004/08/22 11:37:28 kristerw Exp $
 
 SHA1 (gens-rc3.tar.gz) = 6057564665007686c9ea8df364be3220499f9917
 Size (gens-rc3.tar.gz) = 658729 bytes
@@ -11,7 +11,7 @@ SHA1 (patch-af) = 6e641ec6c0ae7fad6997ce70b48d417e2ec7dfd7
 SHA1 (patch-ag) = a80a828b716e3b7e342fb52c583e18305be8c627
 SHA1 (patch-ah) = e8a6264b351c4a7fb3fb1bd4dd5a482dcef763ae
 SHA1 (patch-ai) = 596fe718e5c38091a06198413bcf29b3c668571f
-SHA1 (patch-aj) = 63b9832fde01884631923e16eb0f165815d0704f
+SHA1 (patch-aj) = e550c0708e664b9138d5310cb7aeee6917919c89
 SHA1 (patch-ak) = fbf85318880857783cd98348af627b7c6e444382
 SHA1 (patch-am) = 3e49691329cdfaf60f89136d104ec5e87cd6e255
 SHA1 (patch-an) = 94a6a857238edbf3db0daea59400f5b13fc1ed2f
@@ -19,5 +19,7 @@ SHA1 (patch-ao) = 04bbf581f156cf3f9f119295a00071f29c2b1ab7
 SHA1 (patch-ap) = 634fa5f851b06f09c0a511c65278c002944c29d4
 SHA1 (patch-aq) = af968fb3ce22aa147ac4b47d0739db45977eacf8
 SHA1 (patch-ar) = c97b6dfd255ca64f7a5efc02e2f6b0f4b39706ec
-SHA1 (patch-as) = 9ef67fd99afa9844127f5fbca9b8524e00864aee
+SHA1 (patch-as) = ed6586473668f0226862741ae09bad16278a280b
 SHA1 (patch-at) = 37c78682d91516e0c757993ee29b61437f8e3496
+SHA1 (patch-au) = daae4256b95012356ae0cc4a7fde3509bb7f5964
+SHA1 (patch-av) = 7d6ccfae4f81ed89295a3b8f8aea751bca111600
diff --git a/emulators/gens/patches/patch-aj b/emulators/gens/patches/patch-aj
index 5cc421e14f2..5e584b3e632 100644
--- a/emulators/gens/patches/patch-aj
+++ b/emulators/gens/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2004/08/15 12:13:53 dillo Exp $
+$NetBSD: patch-aj,v 1.3 2004/08/22 11:37:28 kristerw Exp $
 
---- src/gens/emulator/g_main.c.orig	2004-05-18 22:34:00.000000000 +0200
-+++ src/gens/emulator/g_main.c
-@@ -55,6 +55,23 @@ int Intro_Style = 2;
+--- src/gens/emulator/g_main.c.orig	Tue May 18 22:34:00 2004
++++ src/gens/emulator/g_main.c	Sun Aug 22 13:28:23 2004
+@@ -55,6 +55,23 @@
  int SegaCD_Accurate = 0;
  int Kaillera_Client_Running = 0;
  
@@ -26,7 +26,7 @@ $NetBSD: patch-aj,v 1.2 2004/08/15 12:13:53 dillo Exp $
  static int Gens_Running = 0;
  
  void
-@@ -394,6 +411,13 @@ update_SDL_events ()
+@@ -394,6 +411,13 @@
  
  	      break;
  
@@ -40,7 +40,7 @@ $NetBSD: patch-aj,v 1.2 2004/08/15 12:13:53 dillo Exp $
  	    case SDLK_v:
  	      if (KMOD_CTRL & mod)
  		{
-@@ -429,14 +453,14 @@ update_SDL_events ()
+@@ -429,14 +453,14 @@
  	case SDL_JOYAXISMOTION:
  	  if (event.jaxis.axis < 2)
  	    {
@@ -57,10 +57,25 @@ $NetBSD: patch-aj,v 1.2 2004/08/15 12:13:53 dillo Exp $
  		{
  		  joystate[0x100 * event.jaxis.which +
  			   ((event.jaxis.axis == 0) ? 0x4 : 0x2)] = 1;
-@@ -850,3 +874,83 @@ Build_Language_String (void)
+@@ -661,11 +685,11 @@
+ int
+ main (int argc, char *argv[])
+ {
+-  Init_Genesis_Bios ();
+-
+   char sdlbuf[32];
+   GtkWidget *widget;
+ 
++  Init_Genesis_Bios ();
++
+   add_pixmap_directory (DATADIR);
+   gtk_init (&argc, &argv);
+   gens_window = create_gens_window ();
+@@ -849,4 +873,84 @@
+     }
  
    return (0);
- }
++}
 +
 +void PlayMovie()
 +{
@@ -140,4 +155,4 @@ $NetBSD: patch-aj,v 1.2 2004/08/15 12:13:53 dillo Exp $
 +  MoviePlaying = 0;
 +  free(MovieData);
 +  MovieData = NULL;
-+}
+ }
diff --git a/emulators/gens/patches/patch-as b/emulators/gens/patches/patch-as
index 61b8d44df2c..c921cbfbf0d 100644
--- a/emulators/gens/patches/patch-as
+++ b/emulators/gens/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.1 2004/08/15 12:13:53 dillo Exp $
+$NetBSD: patch-as,v 1.2 2004/08/22 11:37:28 kristerw Exp $
 
---- src/gens/util/save.c.orig	2004-05-18 22:33:59.000000000 +0200
-+++ src/gens/util/save.c
-@@ -101,8 +101,8 @@ Change_File_L (char *Dest, char *Dir)
+--- src/gens/util/save.c.orig	Tue May 18 22:33:59 2004
++++ src/gens/util/save.c	Sun Aug 22 13:24:38 2004
+@@ -101,8 +101,8 @@
  
    if (filename)
      {
@@ -12,7 +12,7 @@ $NetBSD: patch-as,v 1.1 2004/08/15 12:13:53 dillo Exp $
        return 1;
      }
    return 0;
-@@ -130,8 +130,37 @@ Change_File_L_CD (char *Dest, char *Dir)
+@@ -130,8 +130,37 @@
  
    if (filename)
      {
@@ -50,3 +50,18 @@ $NetBSD: patch-as,v 1.1 2004/08/15 12:13:53 dillo Exp $
        return 1;
      }
    return 0;
+@@ -268,11 +297,12 @@
+ int
+ Save_State (char *Name)
+ {
+-  if (Name == NULL)
+-    return 0;
+   FILE *f;
+   unsigned char *buf;
+   int len;
++
++  if (Name == NULL)
++    return 0;
+ 
+   buf = State_Buffer;
+   if ((f = fopen (Name, "wb")) == NULL)
diff --git a/emulators/gens/patches/patch-au b/emulators/gens/patches/patch-au
new file mode 100644
index 00000000000..773c9d979b5
--- /dev/null
+++ b/emulators/gens/patches/patch-au
@@ -0,0 +1,21 @@
+$NetBSD: patch-au,v 1.1 2004/08/22 11:37:28 kristerw Exp $
+
+--- src/gens/sdllayer/g_sdlsound.c.orig	Sun Aug 22 13:22:13 2004
++++ src/gens/sdllayer/g_sdlsound.c	Sun Aug 22 13:23:10 2004
+@@ -53,6 +53,7 @@
+ int
+ Init_Sound (void)
+ {
++  SDL_AudioSpec spec;
+   int i;
+ 
+   if (Sound_Initialised)
+@@ -122,8 +123,6 @@
+     }
+ 
+   pMsndOut = (unsigned char *) malloc (Seg_Lenght << 2);
+-
+-  SDL_AudioSpec spec;
+ 
+   spec.freq = Sound_Rate;
+   spec.format = AUDIO_S16SYS;
diff --git a/emulators/gens/patches/patch-av b/emulators/gens/patches/patch-av
new file mode 100644
index 00000000000..88b77d243f9
--- /dev/null
+++ b/emulators/gens/patches/patch-av
@@ -0,0 +1,24 @@
+$NetBSD: patch-av,v 1.1 2004/08/22 11:37:28 kristerw Exp $
+
+--- src/gens/util/gym.c.orig	Sun Aug 22 13:26:20 2004
++++ src/gens/util/gym.c	Sun Aug 22 13:26:57 2004
+@@ -159,6 +159,9 @@
+ int
+ Start_Play_GYM (void)
+ {
++  gchar *filename = NULL;
++  GtkWidget *widget;
++  gint res;
+   char Name[1024];
+ 
+   if (Game || !(Sound_Enable))
+@@ -185,9 +188,6 @@
+ 
+   memset (Name, 0, 1024);
+ 
+-  gchar *filename = NULL;
+-  GtkWidget *widget;
+-  gint res;
+   widget =
+     create_file_chooser_dialog ("Load GYM file",
+ 				GTK_FILE_CHOOSER_ACTION_OPEN);