pkg/50391: x11/XaoS does not build

[schaecsn%gmx.net@localhost]

>Number:         50391
>Category:       pkg
>Synopsis:       x11/XaoS does not build
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Nov 02 04:50:00 +0000 2015
>Originator:     Stefan Schaeckeler
>Release:        pkgsrc 2015Q3
>Organization:
>Environment:
NetBSD t60p 7.0 NetBSD 7.0 (GENERIC) #0: Sat Sep 26 20:21:41 PDT 2015  root@t60p:/usr/obj/sys/arch/i386/compile/GENERIC i386
>Description:
x11/XaoS does not build for me on NetBSD 7.0/i386. Apparently prototype does not match definition for some functions:

gcc -O2 -march=prescott -pipe -I/usr/local/include -I/usr/include -I/usr/X11R7/include  -I/usr/X11R7/include -I/usr/local/include -fomit-frame-pointer -DSFFE_USING -DSFFE_CMPLX_GSL -I/tmp/pkgsrc/x11/XaoS/work/xaos-3.6/src/include -I/usr/local/include -I/usr/include -I/usr/X11R7/include  -c -o zoom.o zoom.c
zoom.c:156:18: error: conflicting types for 'fillline_8'
 #define fillline fillline_8
                  ^
zoomd.c:283:20: note: in expansion of macro 'fillline'
 static INLINE void fillline(int line)
                    ^
zoom.c:144:13: note: previous declaration of 'fillline_8' was here
 static void fillline_8(int line) REGISTERS(0);
             ^
zoom.c:163:18: error: conflicting types for 'fillline_32'
 #define fillline fillline_32
                  ^
zoomd.c:283:20: note: in expansion of macro 'fillline'
 static INLINE void fillline(int line)
                    ^
zoom.c:147:13: note: previous declaration of 'fillline_32' was here
 static void fillline_32(int line) REGISTERS(0);
             ^
zoom.c:170:18: error: conflicting types for 'fillline_24'
 #define fillline fillline_24
                  ^
zoomd.c:283:20: note: in expansion of macro 'fillline'
 static INLINE void fillline(int line)
                    ^
zoom.c:146:13: note: previous declaration of 'fillline_24' was here
 static void fillline_24(int line) REGISTERS(0);
             ^
zoom.c:177:18: error: conflicting types for 'fillline_16'
 #define fillline fillline_16
                  ^
zoomd.c:283:20: note: in expansion of macro 'fillline'
 static INLINE void fillline(int line)
                    ^
zoom.c:145:13: note: previous declaration of 'fillline_16' was here
 static void fillline_16(int line) REGISTERS(0);
             ^
zoom.c:937:1: error: conflicting types for 'moveoldpoints'
 moveoldpoints(void /*@unused@ */ *data1,
 ^
zoom.c:142:1: note: previous declaration of 'moveoldpoints' was here
 moveoldpoints(void *data1, struct taskinfo *task, int r1, int r2)
 ^
<builtin>: recipe for target 'zoom.o' failed
gmake[2]: *** [zoom.o] Error 1
gmake[2]: *** Waiting for unfinished jobs....

>How-To-Repeat:

>Fix:
$NetBSD$

--- src/engine/zoom.c.orig	2015-11-01 20:40:43.000000000 -0800
+++ src/engine/zoom.c	2015-11-01 20:41:31.000000000 -0800
@@ -138,13 +138,11 @@
 #endif
 
 #ifndef USE_i386ASM
-static void
-moveoldpoints(void *data1, struct taskinfo *task, int r1, int r2)
-REGISTERS(0);
-static void fillline_8(int line) REGISTERS(0);
-static void fillline_16(int line) REGISTERS(0);
-static void fillline_24(int line) REGISTERS(0);
-static void fillline_32(int line) REGISTERS(0);
+static void moveoldpoints(void *data1, struct taskinfo *task, int r1, int r2);
+static INLINE void fillline_8(int line);
+static INLINE void fillline_16(int line);
+static INLINE void fillline_24(int line);
+static INLINE void fillline_32(int line);
 #endif
 
 /*first of all inline driver section */