follow-up bits

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 77642c8bce9003cc3c5c0c7468bcd62b8f788883..007082cba622aeeed0e951f157e3e679b8e6c181 100644 (file)
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -898,3 +898,4 @@ adjust window port interface to pass a pointer to a glyph_info struct which
        contains the glyph itself, the ttychar, the color, the glyphflags,
        and the symset index; this affects two window port calls that get
        passed glyphs: print_glyph() and add_menu().
+switch from k&r C to C99

diff --git a/src/mkmaze.c b/src/mkmaze.c
index e5db13835e7e95fb47568efcb6d6b6c13f60016b..49d5f5c2c44e870c2fe8927b658da0807356f213 100644 (file)
--- a/src/mkmaze.c
+++ b/src/mkmaze.c
@@ -664,7 +664,7 @@ migr_booty_item(int otyp, const char* gang)
 }
 
 static void
-stolen_booty(VOID_ARGS)
+stolen_booty(void)
 {
     char *gang, gang_name[BUFSZ];
     struct monst *mtmp;

diff --git a/src/spell.c b/src/spell.c
index a56536e7a77a9bd2f954ec5a0dce040767a810ef..512ac8479b7c84a49dfddf293a7cd78536c5d138 100644 (file)
--- a/src/spell.c
+++ b/src/spell.c
@@ -338,7 +338,7 @@ book_cursed(struct obj* book)
 }
 
 static int
-learn(VOID_ARGS)
+learn(void)
 {
     int i;
     short booktype;

diff --git a/src/steal.c b/src/steal.c
index a887c0cb2b311304d34258c818bbe1459e84f710..cfd3fcfdfb73251936450de35a40fe14cdeff76a 100644 (file)
--- a/src/steal.c
+++ b/src/steal.c
@@ -144,7 +144,7 @@ thiefdead(void)
 /* called via (*g.afternmv)() when hero finishes taking off armor that
    was slated to be stolen but the thief died in the interim */
 static int
-unstolenarm(VOID_ARGS)
+unstolenarm(void)
 {
     struct obj *obj;
 
@@ -161,7 +161,7 @@ unstolenarm(VOID_ARGS)
 }
 
 static int
-stealarm(VOID_ARGS)
+stealarm(void)
 {
     register struct monst *mtmp;
     register struct obj *otmp;

diff --git a/win/curses/cursdial.c b/win/curses/cursdial.c
index 6c30e3e5355ba5d3f0362ab9881abc9c518e0491..67fae2c10be22d9bacf378f2d23030b4f725e2e6 100644 (file)
--- a/win/curses/cursdial.c
+++ b/win/curses/cursdial.c
@@ -21,36 +21,6 @@
    set up by curses_init_nhwindows() */
 extern char erase_char, kill_char;
 
-/*
- * Note:
- * FIXME
- *  Prototypes need to use the widened/unwidened type macros (CHAR_P, &c)
- *  in order to match fields of the window_procs struct (see winprocs.h).
- *  But for a standard-conforming compiler, we'll end up with the widened
- *  types necessary to match the mixed prototype/old-style function
- *  definition environment as used by nethack's core.  Prototype
-int func(CHAR_P);
- *  becomes
-int func(int);
- *  after expansion, which matches the definition
-int func(arg) char arg; { ... }
- *  according to the rules of the C standard.  But the use of new-style
- *  definitions
-int func(char arg) { ... }
- *  by the curses interface turns that into a conflict.  No widening takes
- *  place so it ought to be 'int func(char);' instead.  Unfortunately that
- *  would be incompatible for functions assigned to window_procs.
- *
- *  So, the code here (also cursmain.c and cursinvt.c) is mis-using the
- *  widening macros for variable types
-int func(CHAR_P arg) { ... }
- *  (no doubt modelling it after the C++ code in win/Qt where the option
- *  to switch the applicable definitions to old-style isn't available).
- *  Other alternatives aren't significantly better so just live with it.
- *  [Redoing the windowing interface to avoid narrow arguments would be
- *  better since that would fix Qt's usage too.]
- */
-
 /* Dialog windows for curses interface */
 
 

diff --git a/win/curses/cursmain.c b/win/curses/cursmain.c
index 785054e1f5375767e6b24cbe1752b469206da273..d201e22723e3b89f1f8577b5c04115b4d0f41ec0 100644 (file)
--- a/win/curses/cursmain.c
+++ b/win/curses/cursmain.c
@@ -25,7 +25,7 @@ static void dummy_update_position_bar(char *);
 #endif
 #ifdef CHANGE_COLOR
 static void dummy_change_color(int, long, int);
-static char *dummy_get_color_string(VOID_ARGS);
+static char *dummy_get_color_string(void);
 #endif
 
 /* Public functions for curses NetHack interface */