Fix build with gcc-4.1 on NetBSD-3.99.21.

4 files changed, 48 insertions, 14 deletions

diff --git a/emulators/snes9x/distinfo b/emulators/snes9x/distinfo
index 224ff18022c..930a57b463d 100644
--- a/emulators/snes9x/distinfo
+++ b/emulators/snes9x/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2006/05/02 13:18:08 joerg Exp $
+$NetBSD: distinfo,v 1.15 2006/07/05 21:21:36 wiz Exp $
 
 SHA1 (snes9x-1.43-src.tar.gz) = c6883c451aeb442030862ec19a8dca25ee02d82c
 RMD160 (snes9x-1.43-src.tar.gz) = d2003f7afb208109405b41f4eec586b93518f9b2
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = c1e35daa7e53536d05c1633b78c00d511ae7feb5
 SHA1 (patch-ad) = c5febcdd6b5bf0f3b4b5d8b0bc19c4716434a23e
 SHA1 (patch-ae) = c4258835925ee3a6e3606ad895ff697f379cb22f
 SHA1 (patch-af) = 19d86d23e3af2c0cef09b8eeff1303d6f100c2f8
-SHA1 (patch-ag) = 1c05d83c9d21f46219cdd1be0c79af3ce9f22e62
+SHA1 (patch-ag) = b31e3840ff1245104d1bb093613eb793f4fb7a5a
 SHA1 (patch-ah) = eb5ff0fed972644f9c8599ec5eb6a3cd3ce160cb
 SHA1 (patch-ai) = 06bd00790d1a84ee31114de4205bba22b48cd547
 SHA1 (patch-aj) = f5cdf8e917f787d7e9fc657ed7197a2c28460375
@@ -20,3 +20,5 @@ SHA1 (patch-an) = 3ae10526aa66ef235c223e891c67b4aed6fc48df
 SHA1 (patch-ao) = b5b721563aee09909b7d6143bd699ec86ccaed3b
 SHA1 (patch-ap) = 1c1b7f1b45d75688870a94dadadb6da055e99cd0
 SHA1 (patch-aq) = 6c591ec195bd06c2d0dfd6a947d0e57657fb306e
+SHA1 (patch-ar) = 72a158e69b885b9ecf47245b9b83f8b50d48f96d
+SHA1 (patch-as) = 64a9fb042f40a4a699bd4128d538fae1cb9cb810
diff --git a/emulators/snes9x/patches/patch-ag b/emulators/snes9x/patches/patch-ag
index 1c3b7788f4b..30e4e5f4142 100644
--- a/emulators/snes9x/patches/patch-ag
+++ b/emulators/snes9x/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.8 2006/05/02 13:18:08 joerg Exp $
+$NetBSD: patch-ag,v 1.9 2006/07/05 21:21:37 wiz Exp $
 
 --- unix/unix.cpp.orig	2004-12-30 22:15:47.000000000 +0000
 +++ unix/unix.cpp
@@ -39,7 +39,7 @@ $NetBSD: patch-ag,v 1.8 2006/05/02 13:18:08 joerg Exp $
  
  #include "snes9x.h"
  #include "memmap.h"
-@@ -168,6 +181,60 @@ uint32 joypads [5] = {0};
+@@ -168,6 +181,62 @@ uint32 joypads [5] = {0};
  int NumControllers = 5;
  
  #ifdef JOYSTICK_SUPPORT
@@ -49,7 +49,9 @@ $NetBSD: patch-ag,v 1.8 2006/05/02 13:18:08 joerg Exp $
 +#include <libusbhid.h>
 +}
 +#elif defined(HAVE_USBHID_H)
++START_EXTERN_C
 +#include <usbhid.h>
++END_EXTERN_C
 +#else
 +#include <usb.h>
 +#endif
@@ -100,7 +102,7 @@ $NetBSD: patch-ag,v 1.8 2006/05/02 13:18:08 joerg Exp $
  #if defined(__linux)
  #include <linux/joystick.h>
  int js_fd [4] = {-1, -1, -1, -1};
-@@ -227,7 +294,7 @@ char *snapshot_filename = NULL;
+@@ -227,7 +296,7 @@ char *snapshot_filename = NULL;
  char *SDD1_pack = NULL;
  
  //FIXME: I see no reason not to configureenable this for all Unixen
@@ -109,7 +111,7 @@ $NetBSD: patch-ag,v 1.8 2006/05/02 13:18:08 joerg Exp $
  static void sigbrkhandler(int)
  {
      CPU.Flags |= DEBUG_MODE_FLAG;
-@@ -700,6 +767,110 @@ void S9xInitInputDevices ()
+@@ -700,6 +769,110 @@ void S9xInitInputDevices ()
  #ifdef JOYSTICK_SUPPORT
  void InitJoysticks ()
  {
@@ -220,7 +222,7 @@ $NetBSD: patch-ag,v 1.8 2006/05/02 13:18:08 joerg Exp $
  #ifdef JSIOCGVERSION
      int version;
      unsigned char axes, buttons;
-@@ -756,6 +927,77 @@ void InitJoysticks ()
+@@ -756,6 +929,77 @@ void InitJoysticks ()
  
  void ReadJoysticks ()
  {
@@ -298,7 +300,7 @@ $NetBSD: patch-ag,v 1.8 2006/05/02 13:18:08 joerg Exp $
  #ifdef JSIOCGVERSION
      struct js_event js_ev;
      int i;
-@@ -1646,7 +1888,7 @@ bool8 S9xOpenSoundDevice (int mode, bool
+@@ -1646,7 +1890,7 @@ bool8 S9xOpenSoundDevice (int mode, bool
  }
  #endif
  
@@ -307,7 +309,7 @@ $NetBSD: patch-ag,v 1.8 2006/05/02 13:18:08 joerg Exp $
  static int Rates[8] =
  {
      0, 8000, 11025, 16000, 22050, 32000, 44100, 48000
-@@ -1662,12 +1904,19 @@ bool8 S9xOpenSoundDevice (int mode, bool
+@@ -1662,12 +1906,19 @@ bool8 S9xOpenSoundDevice (int mode, bool
      /* Linux version (OSS) */
      int J, K;
  
@@ -328,7 +330,7 @@ $NetBSD: patch-ag,v 1.8 2006/05/02 13:18:08 joerg Exp $
  #ifdef MMAP_SOUND 
     if (ioctl (so.sound_fd, SNDCTL_DSP_GETCAPS, &J) < 0)
      {
-@@ -1711,14 +1960,14 @@ bool8 S9xOpenSoundDevice (int mode, bool
+@@ -1711,14 +1962,14 @@ bool8 S9xOpenSoundDevice (int mode, bool
  	so.sixteen_bit = TRUE;
  
      so.stereo = stereo;
@@ -345,7 +347,7 @@ $NetBSD: patch-ag,v 1.8 2006/05/02 13:18:08 joerg Exp $
      {
  	perror ("ioctl SNDCTL_DSP_SPEED");
  	return (FALSE);
-@@ -1743,7 +1992,7 @@ bool8 S9xOpenSoundDevice (int mode, bool
+@@ -1743,7 +1994,7 @@ bool8 S9xOpenSoundDevice (int mode, bool
  	perror ("ioctl SNDCTL_DSP_SETFRAGMENT");
  	return (FALSE);
      }
@@ -354,7 +356,7 @@ $NetBSD: patch-ag,v 1.8 2006/05/02 13:18:08 joerg Exp $
      
  #ifdef MMAP_SOUND
      J = PCM_ENABLE_OUTPUT;
-@@ -1768,7 +2017,7 @@ bool8 S9xOpenSoundDevice (int mode, bool
+@@ -1768,7 +2019,7 @@ bool8 S9xOpenSoundDevice (int mode, bool
  #endif
  
  
@@ -363,7 +365,7 @@ $NetBSD: patch-ag,v 1.8 2006/05/02 13:18:08 joerg Exp $
  void S9xUnixProcessSound (void)
  {
  }
-@@ -1810,7 +2059,7 @@ void *S9xProcessSound (void *)
+@@ -1810,7 +2061,7 @@ void *S9xProcessSound (void *)
  }
  #endif
  
@@ -372,7 +374,7 @@ $NetBSD: patch-ag,v 1.8 2006/05/02 13:18:08 joerg Exp $
  void S9xGenerateSound ()
  {
      /* Linux and Sun versions */
-@@ -1902,7 +2151,7 @@ void *S9xProcessSound (void *)
+@@ -1902,7 +2153,7 @@ void *S9xProcessSound (void *)
      /* If threads in use, this is to loop indefinitely */
      /* If not, this will be called by timer */
      
diff --git a/emulators/snes9x/patches/patch-ar b/emulators/snes9x/patches/patch-ar
new file mode 100644
index 00000000000..e366840c434
--- /dev/null
+++ b/emulators/snes9x/patches/patch-ar
@@ -0,0 +1,14 @@
+$NetBSD: patch-ar,v 1.1 2006/07/05 21:21:37 wiz Exp $
+
+--- dsp1.h.orig	2006-07-05 21:11:31.000000000 +0000
++++ dsp1.h
+@@ -123,8 +123,8 @@ START_EXTERN_C
+ void S9xResetDSP1 ();
+ uint8 S9xGetDSP (uint16 Address);
+ void S9xSetDSP (uint8 Byte, uint16 Address);
+-END_EXTERN_C
+ 
+ extern struct SDSP1 DSP1;
++END_EXTERN_C
+ 
+ #endif
diff --git a/emulators/snes9x/patches/patch-as b/emulators/snes9x/patches/patch-as
new file mode 100644
index 00000000000..4aa344f2a76
--- /dev/null
+++ b/emulators/snes9x/patches/patch-as
@@ -0,0 +1,16 @@
+$NetBSD: patch-as,v 1.1 2006/07/05 21:21:37 wiz Exp $
+
+--- ppu.h.orig	2004-12-30 22:15:47.000000000 +0000
++++ ppu.h
+@@ -332,9 +332,11 @@ typedef struct{
+ 	uint8 _5A22;
+ } SnesModel;
+ 
++START_EXTERN_C
+ extern SnesModel* Model;
+ extern SnesModel M1SNES;
+ extern SnesModel M2SNES;
++END_EXTERN_C
+ 
+ #define MAX_5C77_VERSION 0x01
+ #define MAX_5C78_VERSION 0x03