Use __dead instead of __attribute__((__noreturn__)).

[bsdgames-darwin.git] / larn / header.h

diff --git a/larn/header.h b/larn/header.h
index ad69b2174f1455f64d471cbdb3d1d6f7f5b03126..121a472ae4bc9a050cad0ed4f76179edf5c7b044 100644 (file)
--- a/larn/header.h
+++ b/larn/header.h
@@ -1,4 +1,4 @@
-/* $NetBSD: header.h,v 1.20 2008/02/03 20:01:24 dholland Exp $  */
+/* $NetBSD: header.h,v 1.22 2008/08/29 00:37:38 gmcgarry Exp $  */

 
 /* header.h            Larn is copyrighted 1986 by Noah Morgan. */
 
 
 /* header.h            Larn is copyrighted 1986 by Noah Morgan. */
 


@@ -337,7 +337,7 @@ extern u_char   course[];
 extern char     diagfile[], helpfile[], ckpfile[], larnlevels[],
                playerids[], optsfile[1024], psname[], savefilename[],
                scorefile[];
 extern char     diagfile[], helpfile[], ckpfile[], larnlevels[],
                playerids[], optsfile[1024], psname[], savefilename[],
                scorefile[];

-extern u_char  *inbuffer, is_alpha[], is_digit[];
+extern u_char  *inbuffer;

 extern u_char   item[MAXX][MAXY], iven[], know[MAXX][MAXY];
 extern const char *levelname[];
 extern char     logfile[], loginname[], logname[], lastmonst[];
 extern u_char   item[MAXX][MAXY], iven[], know[MAXX][MAXY];
 extern const char *levelname[];
 extern char     logfile[], loginname[], logname[], lastmonst[];


@@ -356,7 +356,7 @@ extern u_char   screen[MAXX][MAXY], sex;
 extern const char *speldescript[];
 extern const char *scrollhide[], *scrollname[];
 extern u_char   spelknow[];
 extern const char *speldescript[];
 extern const char *scrollhide[], *scrollname[];
 extern u_char   spelknow[];

-extern u_char   splev[], stealth[MAXX][MAXY], to_lower[], to_upper[], wizard;
+extern u_char   splev[], stealth[MAXX][MAXY], wizard;

 extern short    diroffx[], diroffy[], hitflag, hit2flag, hit3flag, hitp[MAXX][MAXY];
 extern short    iarg[MAXX][MAXY], ivenarg[], lasthx, lasthy, lastnum, lastpx,
                 lastpy;
 extern short    diroffx[], diroffy[], hitflag, hit2flag, hit3flag, hitp[MAXX][MAXY];
 extern short    iarg[MAXX][MAXY], ivenarg[], lasthx, lasthy, lastnum, lastpx,
                 lastpy;


@@ -429,7 +429,7 @@ extern int      rmst, lasttime;
 #endif /* VT100 */
 
 /* macro to output one byte to the output buffer */
 #endif /* VT100 */
 
 /* macro to output one byte to the output buffer */

-#define lprc(ch) ((lpnt>=lpend)?(*lpnt++ =(ch), lflush()):(*lpnt++ =(ch)))
+#define lprc(ch) ((lpnt>=lpend)?(void)(*lpnt++ = (ch), lflush()):(void)(*lpnt++ = (ch)))

 
 /* macro to seed the random number generator */
 #define seedrand(x) (randx=x)
 
 /* macro to seed the random number generator */
 #define seedrand(x) (randx=x)


@@ -441,10 +441,4 @@ extern int      rmst, lasttime;
 /* macros for miscellaneous data conversion */
 #define min(x,y) (((x)>(y))?(y):(x))
 #define max(x,y) (((x)>(y))?(x):(y))
 /* macros for miscellaneous data conversion */
 #define min(x,y) (((x)>(y))?(y):(x))
 #define max(x,y) (((x)>(y))?(x):(y))

-#define isalpha(x) (is_alpha[x])
-#define isdigit(x) (is_digit[x])
-#define tolower(x) (to_lower[x])
-#define toupper(x) (to_upper[x])
-#define lcc(x) (to_lower[x])
-#define ucc(x) (to_upper[x])

 #endif /* NODEFS */
 #endif /* NODEFS */