Fix build with GCC 3.4+: not only the prototype needs the register

argument...

8 files changed, 263 insertions, 1 deletions

diff --git a/x11/XaoS/distinfo b/x11/XaoS/distinfo
index 0bbdeec7c13..b1136ed53fd 100644
--- a/x11/XaoS/distinfo
+++ b/x11/XaoS/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/04/08 05:02:39 jlam Exp $
+$NetBSD: distinfo,v 1.9 2006/05/20 18:09:49 joerg Exp $
 
 SHA1 (XaoS-3.1.tar.gz) = c9956dbea463040efc46c67f32b3d0e6b3bc4bfe
 RMD160 (XaoS-3.1.tar.gz) = b9761e160dbbbbc5c6aea1cb0f47e0efeac4e9de
@@ -7,3 +7,10 @@ SHA1 (patch-aa) = edace84b4c18ca5b596c79a6f4e77d2879f3fc3b
 SHA1 (patch-ab) = 537dedf39e3c5ae50a91f31715fcb28e30f002ee
 SHA1 (patch-ac) = 51329d932053b4f46acef29837f5648c8cb81589
 SHA1 (patch-ad) = e783ed91ba611af333256a660d537bcf77992893
+SHA1 (patch-ae) = b775be83c1c52483382d046e77a61f51ab4294eb
+SHA1 (patch-af) = e6f22d72957099fcec643053ebbdc9fee1713fcc
+SHA1 (patch-ag) = e8d1b883a51f280f87bb9fb9ef527cf0a727f922
+SHA1 (patch-ah) = c95feb77f3a904ca82df3af7208590eeec2fbc8a
+SHA1 (patch-ai) = 96061838c91e33cfb01068303ac96231de392a4b
+SHA1 (patch-aj) = 300fd90a11abc846449504904e5cc48879a748b5
+SHA1 (patch-ak) = 1eb210b672e18b437f400fde40fc18b23d850e0e
diff --git a/x11/XaoS/patches/patch-ae b/x11/XaoS/patches/patch-ae
new file mode 100644
index 00000000000..2411185a36c
--- /dev/null
+++ b/x11/XaoS/patches/patch-ae
@@ -0,0 +1,47 @@
+$NetBSD: patch-ae,v 1.1 2006/05/20 18:09:49 joerg Exp $
+
+--- src/engine/formulas.c.orig	2003-01-10 10:26:12.000000000 +0000
++++ src/engine/formulas.c
+@@ -247,13 +247,10 @@ hsv_to_rgb (int h, int s, int v, int *re
+     }
+ }
+ 
++CONSTF REGISTERS (3)
+ static unsigned int
+ truecolor_output (number_t zre, number_t zim, number_t pre, number_t pim,
+ 		  int mode, int inset)
+-     CONSTF REGISTERS (3);
+-     static unsigned int
+-       truecolor_output (number_t zre, number_t zim, number_t pre,
+-			 number_t pim, int mode, int inset)
+ {
+   /*WARNING r and b fiends are swapped for HISTORICAL REASONS (BUG :) */
+   int r = 0, g = 0, b = 0, w = 0;
+@@ -441,11 +438,9 @@ truecolor_output (number_t zre, number_t
+ #ifdef __alpha__
+ #define __TEST__
+ #endif
++CONSTF REGISTERS (3)
+ static unsigned int
+ color_output (number_t zre, number_t zim, unsigned int iter)
+-     CONSTF REGISTERS (3);
+-     static unsigned int
+-       color_output (number_t zre, number_t zim, unsigned int iter)
+ {
+   int i;
+   iter <<= SHIFT;
+@@ -525,13 +520,10 @@ color_output (number_t zre, number_t zim
+ 
+ }
+ 
++CONSTF REGISTERS (3)
+ static unsigned int
+ incolor_output (number_t zre, number_t zim, number_t pre, number_t pim,
+ 		unsigned int iter)
+-     CONSTF REGISTERS (3);
+-     static unsigned int
+-       incolor_output (number_t zre, number_t zim, number_t pre, number_t pim,
+-		       unsigned int iter)
+ {
+   int i = iter;
+   switch (cfractalc.incoloringmode)
diff --git a/x11/XaoS/patches/patch-af b/x11/XaoS/patches/patch-af
new file mode 100644
index 00000000000..addc1106422
--- /dev/null
+++ b/x11/XaoS/patches/patch-af
@@ -0,0 +1,20 @@
+$NetBSD: patch-af,v 1.1 2006/05/20 18:09:49 joerg Exp $
+
+--- src/util/timers.c.orig	2006-05-20 17:38:48.000000000 +0000
++++ src/util/timers.c
+@@ -331,6 +331,7 @@ __lookup_timer (tl_timer * t)
+ #endif
+ }
+ 
++REGISTERS (3)
+ int
+ tl_lookup_timer (tl_timer * t)
+ {
+@@ -409,6 +410,7 @@ tl_sleep (int time)
+ #endif
+ }
+ 
++REGISTERS (3)
+ void
+ tl_reset_timer (tl_timer * t)
+ {
diff --git a/x11/XaoS/patches/patch-ag b/x11/XaoS/patches/patch-ag
new file mode 100644
index 00000000000..d83eb2551fe
--- /dev/null
+++ b/x11/XaoS/patches/patch-ag
@@ -0,0 +1,31 @@
+$NetBSD: patch-ag,v 1.1 2006/05/20 18:09:49 joerg Exp $
+
+--- src/ui-hlp/save.c.orig	2006-05-20 17:40:43.000000000 +0000
++++ src/ui-hlp/save.c
+@@ -293,8 +293,6 @@ ndecimals (struct uih_context *uih)
+ }
+ static void
+ savepos (struct uih_context *uih)
+-REGISTERS (3);
+-     static void savepos (struct uih_context *uih)
+ {
+   int n = ndecimals (uih);
+   start_save (uih, "view");
+@@ -307,8 +305,6 @@ REGISTERS (3);
+ }
+ static void
+ savepos2 (struct uih_context *uih)
+-REGISTERS (3);
+-     static void savepos2 (struct uih_context *uih)
+ {
+   int n = ndecimals (uih);
+   start_save (uih, "animateview");
+@@ -321,8 +317,6 @@ REGISTERS (3);
+ }
+ static void
+ savepos3 (struct uih_context *uih)
+-REGISTERS (3);
+-     static void savepos3 (struct uih_context *uih)
+ {
+   int n = ndecimals (uih);
+   start_save (uih, "morphview");
diff --git a/x11/XaoS/patches/patch-ah b/x11/XaoS/patches/patch-ah
new file mode 100644
index 00000000000..19cbe7aa0d2
--- /dev/null
+++ b/x11/XaoS/patches/patch-ah
@@ -0,0 +1,100 @@
+$NetBSD: patch-ah,v 1.1 2006/05/20 18:09:49 joerg Exp $
+
+--- src/engine/docalc.c.orig	2006-05-20 17:48:28.000000000 +0000
++++ src/engine/docalc.c
+@@ -115,21 +115,15 @@
+ #ifdef UNCOMPRESS
+ /*uncompressed version of loop */
+ #ifdef SMOOTHMODE
++CONSTF REGISTERS (3)
+ static unsigned int FUNCTYPE
+ SCALC (register number_t zre, register number_t zim, register number_t pre,
+        register number_t pim)
+-     CONSTF REGISTERS (3);
+-     static unsigned int FUNCTYPE
+-       SCALC (register number_t zre, register number_t zim,
+-	      register number_t pre, register number_t pim)
+ #else
++CONSTF REGISTERS (3)
+ static unsigned int FUNCTYPE
+ CALC (register number_t zre, register number_t zim, register number_t pre,
+       register number_t pim)
+-     CONSTF REGISTERS (3);
+-     static unsigned
+-       CALC (register number_t zre, register number_t zim,
+-	     register number_t pre, register number_t pim)
+ #endif
+ {
+   register unsigned int iter = cfractalc.maxiter;
+@@ -252,21 +246,15 @@ CALC (register number_t zre, register nu
+ }
+ #else
+ #ifdef SMOOTHMODE
++CONSTF REGISTERS (3)
+ static unsigned int FUNCTYPE
+ SCALC (register number_t zre, register number_t zim, register number_t pre,
+        register number_t pim)
+-     CONSTF REGISTERS (3);
+-     static unsigned int FUNCTYPE
+-       SCALC (register number_t zre, register number_t zim,
+-	      register number_t pre, register number_t pim)
+ #else
++CONSTF REGISTERS (3)
+ static unsigned int FUNCTYPE
+ CALC (register number_t zre, register number_t zim, register number_t pre,
+       register number_t pim)
+-     CONSTF REGISTERS (3);
+-     static unsigned int FUNCTYPE
+-       CALC (register number_t zre, register number_t zim,
+-	     register number_t pre, register number_t pim)
+ #endif
+ {
+   register unsigned int iter = cfractalc.maxiter /*& (~(int) 3) */ ;
+@@ -344,21 +332,15 @@ CALC (register number_t zre, register nu
+ #ifndef UNCOMPRESS
+ 
+ #ifdef SMOOTHMODE
++CONSTF REGISTERS (3)
+ static unsigned int FUNCTYPE
+ SPERI (register number_t zre, register number_t zim, register number_t pre,
+        register number_t pim)
+-     CONSTF REGISTERS (3);
+-     static unsigned int FUNCTYPE
+-       SPERI (register number_t zre, register number_t zim,
+-	      register number_t pre, register number_t pim)
+ #else
++CONSTF REGISTERS (3)
+ static unsigned int FUNCTYPE
+ PERI (register number_t zre, register number_t zim, register number_t pre,
+       register number_t pim)
+-     CONSTF REGISTERS (3);
+-     static unsigned int FUNCTYPE
+-       PERI (register number_t zre, register number_t zim,
+-	     register number_t pre, register number_t pim)
+ #endif
+ {
+   register unsigned int iter = cfractalc.maxiter /*& (~(int) 3) */ , iter1 =
+@@ -467,21 +449,15 @@ end:
+ /*F. : this macros definitions are really strange, but after a while, it's good */
+ 
+ #ifdef SMOOTHMODE
++CONSTF REGISTERS (3)
+ static unsigned int FUNCTYPE
+ SPERI (register number_t zre, register number_t zim, register number_t pre,
+        register number_t pim)
+-     CONSTF REGISTERS (3);
+-     static unsigned int FUNCTYPE
+-       SPERI (register number_t zre, register number_t zim,
+-	      register number_t pre, register number_t pim)
+ #else
++CONSTF REGISTERS (3)
+ static unsigned int FUNCTYPE
+ PERI (register number_t zre, register number_t zim, register number_t pre,
+       register number_t pim)
+-     CONSTF REGISTERS (3);
+-     static unsigned int FUNCTYPE
+-       PERI (register number_t zre, register number_t zim,
+-	     register number_t pre, register number_t pim)
+ #endif
+ {
+   register unsigned int iter = cfractalc.maxiter /*& (~(int) 3) */ ;
diff --git a/x11/XaoS/patches/patch-ai b/x11/XaoS/patches/patch-ai
new file mode 100644
index 00000000000..1a301eeb281
--- /dev/null
+++ b/x11/XaoS/patches/patch-ai
@@ -0,0 +1,28 @@
+$NetBSD: patch-ai,v 1.1 2006/05/20 18:09:49 joerg Exp $
+
+--- src/engine/zoomd.c.orig	2006-05-20 17:54:37.000000000 +0000
++++ src/engine/zoomd.c
+@@ -25,10 +25,9 @@
+  *  points 1 2 3 4 5 6 8 must be the same (point 8 is not yet calculated)
+  *
+  */
++REGISTERS (3)
+ static void
+ calcline (realloc_t * RESTRICT ry)
+-REGISTERS (3);
+-     static void calcline (realloc_t * RESTRICT ry)
+ {
+   number_t y;
+   int range = cfractalc.range;
+@@ -137,10 +136,9 @@ REGISTERS (3);
+   ry->recalculate = 0;
+   ry->dirty = 0;
+ }
++REGISTERS (3)
+ static void
+ calccolumn (realloc_t * RESTRICT rx)
+-REGISTERS (3);
+-     static void calccolumn (realloc_t * RESTRICT rx)
+ {
+   number_t x;
+   int range = cfractalc.range;
diff --git a/x11/XaoS/patches/patch-aj b/x11/XaoS/patches/patch-aj
new file mode 100644
index 00000000000..189e526cc9f
--- /dev/null
+++ b/x11/XaoS/patches/patch-aj
@@ -0,0 +1,16 @@
+$NetBSD: patch-aj,v 1.1 2006/05/20 18:09:50 joerg Exp $
+
+--- src/engine/zoom.c.orig	2006-05-20 17:56:29.000000000 +0000
++++ src/engine/zoom.c
+@@ -1324,10 +1324,9 @@ calculatenew (void /*@unused@ */ *data, 
+ 	frames2 += 1);
+ }
+ 
++REGISTERS (3)
+ static void
+ addprices (realloc_t * r, realloc_t * r2)
+-REGISTERS (3);
+-     static void addprices (realloc_t * r, realloc_t * r2)
+ {
+   realloc_t *r3;
+   while (r < r2)
diff --git a/x11/XaoS/patches/patch-ak b/x11/XaoS/patches/patch-ak
new file mode 100644
index 00000000000..1b591de8861
--- /dev/null
+++ b/x11/XaoS/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2006/05/20 18:09:50 joerg Exp $
+
+--- src/engine/plane.c.orig	2006-05-20 17:57:12.000000000 +0000
++++ src/engine/plane.c
+@@ -52,7 +52,7 @@ CONST char *CONST planename[] = {
+   NULL
+ };
+ 
+-
++REGISTERS(3)
+ void
+ recalculate (int plane, number_t * x1, number_t * y1)
+ {