Fix build error with clang.

7 files changed, 180 insertions, 2 deletions

diff --git a/games/xjumpx/files/patch-Makefile b/games/xjumpx/files/patch-Makefile
index 4174ef339558..0a6260c91d92 100644
--- a/games/xjumpx/files/patch-Makefile
+++ b/games/xjumpx/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Nov 24 16:24:37 2006
-+++ Makefile	Fri Nov 24 16:24:48 2006
+--- Makefile.orig	2001-08-14 20:10:46.000000000 +0800
++++ Makefile	2011-09-05 15:19:26.000000000 +0800
 @@ -11,7 +11,7 @@
  
  ## X11 base directory
@@ -9,3 +9,12 @@
  
  
  ## directory for record files
+@@ -46,7 +46,7 @@ APP_DEFAULTS = $(X11BASE)/lib/X11/app-de
+ ########################################################
+ 
+ ## C compiler
+-CC      = gcc
++#CC      = gcc
+ 
+ ## additional include file directory
+ IDIR    = -I$(X11BASE)/include
diff --git a/games/xjumpx/files/patch-hero.c b/games/xjumpx/files/patch-hero.c
new file mode 100644
index 000000000000..0d6ca2f1c547
--- /dev/null
+++ b/games/xjumpx/files/patch-hero.c
@@ -0,0 +1,22 @@
+--- hero.c.orig	2011-09-05 15:17:02.000000000 +0800
++++ hero.c	2011-09-05 15:17:21.000000000 +0800
+@@ -31,12 +31,13 @@
+ **	May 25, 2000 Ver 1.0
+ */
+ 
+-#include<stdio.h>
+-#include<X11/Xlib.h>
+-
+-#include"xjump.h"
+-#include"xjump_xlib.h"
+-#include"key.h"
++#include <stdio.h>
++#include <stdlib.h>
++#include <X11/Xlib.h>
++
++#include "xjump.h"
++#include "xjump_xlib.h"
++#include "key.h"
+ 
+ void HERO_delete( hero_t *hp )
+ {
diff --git a/games/xjumpx/files/patch-key.c b/games/xjumpx/files/patch-key.c
new file mode 100644
index 000000000000..152edfbd925b
--- /dev/null
+++ b/games/xjumpx/files/patch-key.c
@@ -0,0 +1,17 @@
+--- key.c.orig	2011-09-05 15:10:48.000000000 +0800
++++ key.c	2011-09-05 15:11:05.000000000 +0800
+@@ -59,12 +59,12 @@ static void add( Display *d, int key, ch
+ 
+ 	sym = XStringToKeysym(keysym_name);
+ 	if( sym == NoSymbol ){
+-		fprintf(stderr,"KeySym '%s' does not exist.\n");
++		fprintf(stderr,"KeySym '%%s' does not exist.\n");
+ 		return;
+ 	}
+ 	code = XKeysymToKeycode(d,sym);
+ 	if( code == 0 ){
+-		fprintf(stderr,"KeySym '%s' is not defined for any KeyCode.\n");
++		fprintf(stderr,"KeySym '%%s' is not defined for any KeyCode.\n");
+ 		return;
+ 	}
+ 	KeyTable[code] |= key;
diff --git a/games/xjumpx/files/patch-main.c b/games/xjumpx/files/patch-main.c
new file mode 100644
index 000000000000..eced40864ef3
--- /dev/null
+++ b/games/xjumpx/files/patch-main.c
@@ -0,0 +1,64 @@
+--- main.c.orig	2001-08-14 20:32:13.000000000 +0800
++++ main.c	2011-09-05 15:21:32.000000000 +0800
+@@ -31,33 +31,34 @@
+ **	May 25, 2000 Ver 1.0
+ */
+ 
+-#include<stdio.h>
+-#include<time.h>
+-#include<string.h>
+-#include<errno.h>
+-#include<unistd.h>
+-#include<sys/types.h>
+-#include<sys/syslimits.h>
+-#include<signal.h>
+-#include<X11/Intrinsic.h>
+-#include<X11/StringDefs.h>
+-#include<X11/Xaw/Label.h>
+-#include<X11/Xaw/List.h>
+-#include<X11/Xaw/Form.h>
+-#include<X11/Xaw/Viewport.h>
+-#include<X11/Shell.h>
+-#include<X11/xpm.h>
+-
+-#include"key.h"
+-
+-#include"xjump.h"
+-#include"xjump_xlib.h"
+-#include"record.h"
+-
+-#include"picture.xpm"
+-#include"title.xpm"
+-#include"icon.xbm"
+-#include"icon_msk.xbm"
++#include <stdio.h>
++#include <stdlib.h>
++#include <time.h>
++#include <string.h>
++#include <errno.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <limits.h>
++#include <signal.h>
++#include <X11/Intrinsic.h>
++#include <X11/StringDefs.h>
++#include <X11/Xaw/Label.h>
++#include <X11/Xaw/List.h>
++#include <X11/Xaw/Form.h>
++#include <X11/Xaw/Viewport.h>
++#include <X11/Shell.h>
++#include <X11/xpm.h>
++
++#include "key.h"
++
++#include "xjump.h"
++#include "xjump_xlib.h"
++#include "record.h"
++
++#include "picture.xpm"
++#include "title.xpm"
++#include "icon.xbm"
++#include "icon_msk.xbm"
+ 
+ /***********************************************************
+ **
diff --git a/games/xjumpx/files/patch-misc.c b/games/xjumpx/files/patch-misc.c
new file mode 100644
index 000000000000..41fd9ace2ec3
--- /dev/null
+++ b/games/xjumpx/files/patch-misc.c
@@ -0,0 +1,21 @@
+--- misc.c.orig	2001-08-14 20:10:46.000000000 +0800
++++ misc.c	2011-09-05 15:15:48.000000000 +0800
+@@ -31,11 +31,13 @@
+ **	May 25, 2000 Ver 1.0
+ */
+ 
+-#include<stdio.h>
+-#include<stdlib.h>
+-#include<errno.h>
+-#include<sys/types.h>
+-#include<pwd.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <errno.h>
++#include <sys/types.h>
++#include <pwd.h>
++#include <ctype.h>
+ 
+ static long Seed;
+ 
diff --git a/games/xjumpx/files/patch-record.c b/games/xjumpx/files/patch-record.c
new file mode 100644
index 000000000000..04b5184526b0
--- /dev/null
+++ b/games/xjumpx/files/patch-record.c
@@ -0,0 +1,28 @@
+--- record.c.orig	2001-08-14 20:10:46.000000000 +0800
++++ record.c	2011-09-05 15:09:11.000000000 +0800
+@@ -31,14 +31,18 @@
+ **	May 25, 2000 Ver 1.0
+ */
+ 
+-#include<stdio.h>
+-#include<fcntl.h>
+-#include<sys/types.h>
+-#include<pwd.h>
+-#include<ctype.h>
+-#include<errno.h>
++#include <sys/types.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <pwd.h>
++#include <ctype.h>
++#include <errno.h>
+ 
+-#include"record.h"
++#include "record.h"
++#include "xjump.h"
+ 
+ #define FS	'\t'	/* field separator */
+ 
diff --git a/games/xjumpx/files/patch-xjump.h b/games/xjumpx/files/patch-xjump.h
new file mode 100644
index 000000000000..b97d969080f8
--- /dev/null
+++ b/games/xjumpx/files/patch-xjump.h
@@ -0,0 +1,17 @@
+--- xjump.h.orig	2001-08-14 20:10:46.000000000 +0800
++++ xjump.h	2011-09-05 15:22:10.000000000 +0800
+@@ -103,6 +103,14 @@ void FLOOR_move_all( int scroll,int leve
+ floor_t *FLOOR_check(int hx, int hy);
+ void FLOOR_init( void );
+ 
++void HERO_init( hero_t *hp );
++int HERO_move( hero_t *hp, int scroll, int key );
++void HERO_draw( hero_t *hp );
++void HERO_delete( hero_t *hp );
++
++int rnd( int range );
++void srnd( int seed );
++void get_name( char *buf, int bufsiz, int uid );
+ 
+ void GAME_init( void );
+ int GAME_main( int move );