static keyword on prototype, but function missing it

error 28 in line 4090 of "invent.c": redeclaration of var <adjust_ok> with new storage-class
error 28 in line 4100 of "invent.c": redeclaration of var <adjust_gold_ok> with new storage-class
error 28 in line 610 of "mdlib.c": redeclaration of var <count_and_validate_winopts> with new storage-class
error 28 in line 3846 of "options.c": redeclaration of var <pfxfn_cond_> with new storage-class
error 28 in line 3886 of "options.c": redeclaration of var <pfxfn_font> with new storage-class
error 28 in line 5307 of "options.c": redeclaration of var <determine_ambiguities> with new storage-class
error 28 in line 5343 of "options.c": redeclaration of var <length_without_val> with new storage-class
error 28 in line 6853 of "options.c": redeclaration of var <illegal_menu_cmd_key> with new storage-class
error 28 in line 7708 of "options.c": redeclaration of var <count_apes> with new storage-class
error 28 in line 2686 of "pickup.c": redeclaration of var <stash_ok> with new storage-class
error 28 in line 1008 of "read.c": redeclaration of var <can_center_cloud> with new storage-class
error 28 in line 31 of "rnd.c": redeclaration of var <whichrng> with new storage-class
This commit is contained in:
nhmall
2022-02-02 15:33:49 -05:00
parent afe36abdac
commit c26bae521b
6 changed files with 12 additions and 12 deletions
+2 -2
View File
@@ -4085,7 +4085,7 @@ check_invent_gold(const char *why) /* 'why' == caller in case of warning */
} }
/* normal getobj callback for item to #adjust; excludes gold */ /* normal getobj callback for item to #adjust; excludes gold */
int static int
adjust_ok(struct obj *obj) adjust_ok(struct obj *obj)
{ {
if (!obj || obj->oclass == COIN_CLASS) if (!obj || obj->oclass == COIN_CLASS)
@@ -4095,7 +4095,7 @@ adjust_ok(struct obj *obj)
} }
/* getobj callback for item to #adjust if gold is wonky; allows gold */ /* getobj callback for item to #adjust if gold is wonky; allows gold */
int static int
adjust_gold_ok(struct obj *obj) adjust_gold_ok(struct obj *obj)
{ {
if (!obj) if (!obj)
+1 -1
View File
@@ -605,7 +605,7 @@ static const char *const build_opts[] = {
"and basic NetHack features" "and basic NetHack features"
}; };
int static int
count_and_validate_winopts(void) count_and_validate_winopts(void)
{ {
int i, cnt = 0; int i, cnt = 0;
+6 -6
View File
@@ -3840,7 +3840,7 @@ optfn_windowtype(int optidx, int req, boolean negated UNUSED,
* Prefix-handling functions * Prefix-handling functions
*/ */
int static int
pfxfn_cond_(int optidx UNUSED, int req, boolean negated, pfxfn_cond_(int optidx UNUSED, int req, boolean negated,
char *opts, char *op UNUSED) char *opts, char *op UNUSED)
{ {
@@ -3881,7 +3881,7 @@ pfxfn_cond_(int optidx UNUSED, int req, boolean negated,
return optn_ok; return optn_ok;
} }
int static int
pfxfn_font(int optidx, int req, boolean negated, char *opts, char *op) pfxfn_font(int optidx, int req, boolean negated, char *opts, char *op)
{ {
int opttype = -1; int opttype = -1;
@@ -5302,7 +5302,7 @@ bad_negation(const char *optname, boolean with_parameter)
/* go through all of the options and set the minmatch value /* go through all of the options and set the minmatch value
based on what is needed for uniqueness of each individual based on what is needed for uniqueness of each individual
option. Set a minimum of 3 characters. */ option. Set a minimum of 3 characters. */
void static void
determine_ambiguities(void) determine_ambiguities(void)
{ {
int i, j, len, tmpneeded, needed[SIZE(allopt)]; int i, j, len, tmpneeded, needed[SIZE(allopt)];
@@ -5338,7 +5338,7 @@ determine_ambiguities(void)
} }
} }
int static int
length_without_val(const char *user_string, int len) length_without_val(const char *user_string, int len)
{ {
const char *p = index(user_string, ':'), const char *p = index(user_string, ':'),
@@ -6848,7 +6848,7 @@ parse_role_opts(int optidx, boolean negated, const char *fullname,
} }
/* Check if character c is illegal as a menu command key */ /* Check if character c is illegal as a menu command key */
boolean static boolean
illegal_menu_cmd_key(uchar c) illegal_menu_cmd_key(uchar c)
{ {
if (c == 0 || c == '\r' || c == '\n' || c == '\033' || c == ' ' if (c == 0 || c == '\r' || c == '\n' || c == '\033' || c == ' '
@@ -7703,7 +7703,7 @@ count_cond(void)
return cnt; return cnt;
} }
int static int
count_apes(void) count_apes(void)
{ {
int numapes = 0; int numapes = 0;
+1 -1
View File
@@ -2681,7 +2681,7 @@ u_handsy(void)
} }
/* getobj callback for object to be stashed into a container */ /* getobj callback for object to be stashed into a container */
int static int
stash_ok(struct obj *obj) stash_ok(struct obj *obj)
{ {
if (!obj) if (!obj)
+1 -1
View File
@@ -1003,7 +1003,7 @@ valid_cloud_pos(int x, int y)
/* Callback for getpos_sethilite, also used in determining whether a scroll /* Callback for getpos_sethilite, also used in determining whether a scroll
* should have its regular effects, or not because it was out of range. * should have its regular effects, or not because it was out of range.
*/ */
boolean static boolean
can_center_cloud(int x, int y) can_center_cloud(int x, int y)
{ {
if (!valid_cloud_pos(x, y)) if (!valid_cloud_pos(x, y))
+1 -1
View File
@@ -26,7 +26,7 @@ static struct rnglist_t rnglist[] = {
{ rn2_on_display_rng, FALSE, { 0 } }, /* DISP */ { rn2_on_display_rng, FALSE, { 0 } }, /* DISP */
}; };
int static int
whichrng(int (*fn)(int)) whichrng(int (*fn)(int))
{ {
int i; int i;