Fix build with GCC 4.x:

- Use "stdlib.h" to get prototype for alloca() under NetBSD.
- Remove bogus "extern" declaration for a variable which is declared
  "static" later.
- Fix bad lvalue constructs.

4 files changed, 38 insertions, 11 deletions

diff --git a/emulators/xcopilot/distinfo b/emulators/xcopilot/distinfo
index 0c6a5d7e010..626fc115b48 100644
--- a/emulators/xcopilot/distinfo
+++ b/emulators/xcopilot/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2006/01/12 20:58:56 joerg Exp $
+$NetBSD: distinfo,v 1.6 2006/06/30 22:14:49 tron Exp $
 
 SHA1 (xcopilot-0.6.6.tar.gz) = 91f76d1fd8fc19b6fea18853425aa3076e945d5d
 RMD160 (xcopilot-0.6.6.tar.gz) = e267495db384070e7e192043f23290f0004ecd4a
 Size (xcopilot-0.6.6.tar.gz) = 343264 bytes
 SHA1 (patch-aa) = 3354ed73dfa6c05273c7f430d45bacb0c8adbcf5
 SHA1 (patch-ab) = d0e1eba65c0e8c963953856b939629fa0b99ea3c
-SHA1 (patch-ac) = a495efbbbf5b28016b4b1b0e49c7e8f8b298faf4
+SHA1 (patch-ac) = 7755e1a2ada8e3ca4f1e7d144b82d166ed2d3360
 SHA1 (patch-ad) = b59e359dc575f3321385e54b87c9d6342461bf6f
 SHA1 (patch-ae) = 26067d585aac5fc30fcc8bc58b561acc4bdfae44
 SHA1 (patch-af) = 5b1a93a5b08444e53fdbb17e1148149542cc6dd1
@@ -13,4 +13,5 @@ SHA1 (patch-ag) = 68a22072946811f9cc97434f532081a07fda567f
 SHA1 (patch-ah) = fa166c5ecf7458c91f89b216aee5acb6de270292
 SHA1 (patch-ai) = 255d997e2ef340a8d4b91ce25c2a3071df5c4520
 SHA1 (patch-aj) = 560a3dd902323ec1d07c292b6e8f95acb6c1c939
-SHA1 (patch-ak) = dfb717cb81f797b85d84274f14fc0d36926ccb5d
+SHA1 (patch-ak) = 830984e8d2992b3c6ff1229309328717b4f9f473
+SHA1 (patch-al) = 991331f9cd004ced4b37253a55e6ecc3e66cc7c3
diff --git a/emulators/xcopilot/patches/patch-ac b/emulators/xcopilot/patches/patch-ac
index ac3f560abe4..3ebe55a582a 100644
--- a/emulators/xcopilot/patches/patch-ac
+++ b/emulators/xcopilot/patches/patch-ac
@@ -1,8 +1,22 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/02/05 07:38:15 nathanw Exp $
+$NetBSD: patch-ac,v 1.2 2006/06/30 22:14:49 tron Exp $
 
---- mc68k/memory.c.orig	Wed Feb  3 14:11:09 1999
-+++ mc68k/memory.c	Fri Feb  5 01:28:39 1999
-@@ -377,6 +377,7 @@
+--- mc68k/memory.c.orig	1998-08-25 05:52:56.000000000 +0100
++++ mc68k/memory.c	2006-06-30 23:09:38.000000000 +0100
+@@ -346,9 +346,11 @@
+ 			       0xff, 0xff, 0x00 };
+ 
+     const unsigned char *bootsign = _bootsign, *bootmask = _bootmask;
+-    
++    char *p;
++
++    p = (const char *)rom;
+     while ((*bootsign & *bootmask) == *bootsign)
+-	if ((*((char *)rom)++ & *bootmask++) != *bootsign++)
++	if ((*p++ & *bootmask++) != *bootsign++)
+ 	    return 0;
+ 
+     return 1;
+@@ -377,6 +379,7 @@
    int i;
    char *rombuf;
    char *resetv;
@@ -10,7 +24,7 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/02/05 07:38:15 nathanw Exp $
    int f;
    struct stat st;
    
-@@ -405,12 +406,24 @@
+@@ -405,12 +408,24 @@
      rom_size = pow_of_2;
    }
    
@@ -39,7 +53,7 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/02/05 07:38:15 nathanw Exp $
    if (!nocheck) {
    /* Check if the reset vector looks plausible */
      resetv = (char *)rommemory +
-@@ -430,23 +443,15 @@
+@@ -430,23 +445,15 @@
  	offset = resetv - find_entrypoint((char *)rommemory);
        }
  
diff --git a/emulators/xcopilot/patches/patch-ak b/emulators/xcopilot/patches/patch-ak
index f326e2a8e0b..3d33e8a35f2 100644
--- a/emulators/xcopilot/patches/patch-ak
+++ b/emulators/xcopilot/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1 2006/01/12 20:58:56 joerg Exp $
+$NetBSD: patch-ak,v 1.2 2006/06/30 22:14:49 tron Exp $
 
 --- config.h.in.orig	2006-01-12 20:51:24.000000000 +0000
 +++ config.h.in
@@ -6,7 +6,7 @@ $NetBSD: patch-ak,v 1.1 2006/01/12 20:58:56 joerg Exp $
  /* AIX requires this to be the first thing in the file.  */
  #if HAVE_ALLOCA_H
  # include <alloca.h>
-+#elif defined(__DragonFly__) || defined(__FreeBSD__)
++#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__)
 +# include <stdlib.h>
  #else
  # ifdef _AIX
diff --git a/emulators/xcopilot/patches/patch-al b/emulators/xcopilot/patches/patch-al
new file mode 100644
index 00000000000..bc367cba570
--- /dev/null
+++ b/emulators/xcopilot/patches/patch-al
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.1 2006/06/30 22:14:49 tron Exp $
+
+--- mc68k/custom.h.orig	1998-04-25 18:50:11.000000000 +0100
++++ mc68k/custom.h	2006-06-30 23:07:10.000000000 +0100
+@@ -43,7 +43,6 @@
+ extern void do_cycles(int longtime);
+ extern int do_api(int api);
+ 
+-extern unsigned long cycles;
+ extern unsigned long specialflags;
+ 
+ #define SPCFLAG_STOP 2