Remove uses of __P.

10 files changed, 560 insertions, 560 deletions

diff --git a/hack/def.func_tab.h b/hack/def.func_tab.h
index 062bda81..78957e07 100644
--- a/hack/def.func_tab.h
+++ b/hack/def.func_tab.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: def.func_tab.h,v 1.6 2003/04/02 18:36:34 jsm Exp $	*/
+/*	$NetBSD: def.func_tab.h,v 1.7 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -65,14 +65,14 @@
 #define _DEF_FUNC_TAB_H_
 struct func_tab {
 	char f_char;
-	int (*f_funct) __P((void));
+	int (*f_funct)(void);
 };
 
 extern const struct func_tab cmdlist[];
 
 struct ext_func_tab {
 	const char *ef_txt;
-	int (*ef_funct) __P((void));
+	int (*ef_funct)(void);
 };
 
 extern const struct ext_func_tab extcmdlist[];
diff --git a/hack/extern.h b/hack/extern.h
index 804498cc..e2ef242e 100644
--- a/hack/extern.h
+++ b/hack/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.5 2002/05/26 00:12:12 wiz Exp $	*/
+/*	$NetBSD: extern.h,v 1.6 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -41,628 +41,628 @@
 #include <stdio.h>
 
 /* alloc.c */
-long *alloc __P((unsigned));
-long *enlarge __P((char *, unsigned));
+long *alloc(unsigned);
+long *enlarge(char *, unsigned);
 
 /* hack.apply.c */
-int doapply __P((void));
-int holetime __P((void));
-void dighole __P((void));
+int doapply(void);
+int holetime(void);
+void dighole(void);
 
 /* hack.bones.c */
-void savebones __P((void));
-int getbones __P((void));
+void savebones(void);
+int getbones(void);
 
 /* hack.c */
-void unsee __P((void));
-void seeoff __P((int));
-void domove __P((void));
-void movobj __P((struct obj *, int, int));
-int dopickup __P((void));
-void pickup __P((int));
-void lookaround __P((void));
-int monster_nearby __P((void));
-int rroom __P((int, int));
-int cansee __P((xchar, xchar));
-int sgn __P((int));
-void setsee __P((void));
-void nomul __P((int));
-int abon __P((void));
-int dbon __P((void));
-void losestr __P((int));
-void losehp __P((int, const char *));
-void losehp_m __P((int, struct monst *));
-void losexp __P((void));
-int inv_weight __P((void));
-int inv_cnt __P((void));
-long newuexp __P((void));
+void unsee(void);
+void seeoff(int);
+void domove(void);
+void movobj(struct obj *, int, int);
+int dopickup(void);
+void pickup(int);
+void lookaround(void);
+int monster_nearby(void);
+int rroom(int, int);
+int cansee(xchar, xchar);
+int sgn(int);
+void setsee(void);
+void nomul(int);
+int abon(void);
+int dbon(void);
+void losestr(int);
+void losehp(int, const char *);
+void losehp_m(int, struct monst *);
+void losexp(void);
+int inv_weight(void);
+int inv_cnt(void);
+long newuexp(void);
 
 /* hack.cmd.c */
-void rhack __P((const char *));
-int doextcmd __P((void));
-char lowc __P((int));
-char unctrl __P((int));
-int movecmd __P((int));
-int getdir __P((boolean));
-void confdir __P((void));
-int finddir __P((void));
-int isroom __P((int, int));
-int isok __P((int, int));
+void rhack(const char *);
+int doextcmd(void);
+char lowc(int);
+char unctrl(int);
+int movecmd(int);
+int getdir(boolean);
+void confdir(void);
+int finddir(void);
+int isroom(int, int);
+int isok(int, int);
 
 /* hack.do.c */
-int dodrop __P((void));
-void dropx __P((struct obj *));
-void dropy __P((struct obj *));
-int doddrop __P((void));
-int dodown __P((void));
-int doup __P((void));
-void goto_level __P((int, boolean));
-int donull __P((void));
-int dopray __P((void));
-int dothrow __P((void));
-struct obj *splitobj __P((struct obj *, int));
-void more_experienced __P((int, int));
-void set_wounded_legs __P((long, int));
-void heal_legs __P((void));
+int dodrop(void);
+void dropx(struct obj *);
+void dropy(struct obj *);
+int doddrop(void);
+int dodown(void);
+int doup(void);
+void goto_level(int, boolean);
+int donull(void);
+int dopray(void);
+int dothrow(void);
+struct obj *splitobj(struct obj *, int);
+void more_experienced(int, int);
+void set_wounded_legs(long, int);
+void heal_legs(void);
 
 /* hack.do_name.c */
-coord getpos __P((int, const char *));
-int do_mname __P((void));
-void do_oname __P((struct obj *));
-int ddocall __P((void));
-void docall __P((struct obj *));
-char *xmonnam __P((struct monst *, int));
-char *lmonnam __P((struct monst *));
-char *monnam __P((struct monst *));
-char *Monnam __P((struct monst *));
-char *amonnam __P((struct monst *, const char *));
-char *Amonnam __P((struct monst *, const char *));
-char *Xmonnam __P((struct monst *));
-char *visctrl __P((int));
+coord getpos(int, const char *);
+int do_mname(void);
+void do_oname(struct obj *);
+int ddocall(void);
+void docall(struct obj *);
+char *xmonnam(struct monst *, int);
+char *lmonnam(struct monst *);
+char *monnam(struct monst *);
+char *Monnam(struct monst *);
+char *amonnam(struct monst *, const char *);
+char *Amonnam(struct monst *, const char *);
+char *Xmonnam(struct monst *);
+char *visctrl(int);
 
 /* hack.do_wear.c */
-void off_msg __P((struct obj *));
-int doremarm __P((void));
-int doremring __P((void));
-int dorr __P((struct obj *));
-int cursed __P((struct obj *));
-int armoroff __P((struct obj *));
-int doweararm __P((void));
-int dowearring __P((void));
-void ringoff __P((struct obj *));
-void find_ac __P((void));
-void glibr __P((void));
-struct obj *some_armor __P((void));
-void corrode_armor __P((void));
+void off_msg(struct obj *);
+int doremarm(void);
+int doremring(void);
+int dorr(struct obj *);
+int cursed(struct obj *);
+int armoroff(struct obj *);
+int doweararm(void);
+int dowearring(void);
+void ringoff(struct obj *);
+void find_ac(void);
+void glibr(void);
+struct obj *some_armor(void);
+void corrode_armor(void);
 
 /* hack.dog.c */
-void makedog __P((void));
-void initedog __P((struct monst *));
-void losedogs __P((void));
-void keepdogs __P((void));
-void fall_down __P((struct monst *));
-int dogfood __P((struct obj *));
-int dog_move __P((struct monst *, int));
-int inroom __P((xchar, xchar));
-int tamedog __P((struct monst *, struct obj *));
+void makedog(void);
+void initedog(struct monst *);
+void losedogs(void);
+void keepdogs(void);
+void fall_down(struct monst *);
+int dogfood(struct obj *);
+int dog_move(struct monst *, int);
+int inroom(xchar, xchar);
+int tamedog(struct monst *, struct obj *);
 
 /* hack.eat.c */
-void init_uhunger __P((void));
-int opentin __P((void));
-int Meatdone __P((void));
-int doeat __P((void));
-void gethungry __P((void));
-void morehungry __P((int));
-void lesshungry __P((int));
-int unfaint __P((void));
-void newuhs __P((boolean));
-int poisonous __P((struct obj *));
-int eatcorpse __P((struct obj *));
+void init_uhunger(void);
+int opentin(void);
+int Meatdone(void);
+int doeat(void);
+void gethungry(void);
+void morehungry(int);
+void lesshungry(int);
+int unfaint(void);
+void newuhs(boolean);
+int poisonous(struct obj *);
+int eatcorpse(struct obj *);
 
 /* hack.end.c */
-int dodone __P((void));
-void done1 __P((int));
-void done_intr __P((int));
-void done_hangup __P((int));
-void done_in_by __P((struct monst *));
-void done __P((const char *));
-void topten __P((void));
-void outheader __P((void));
+int dodone(void);
+void done1(int);
+void done_intr(int);
+void done_hangup(int);
+void done_in_by(struct monst *);
+void done(const char *);
+void topten(void);
+void outheader(void);
 struct toptenentry;
-int outentry __P((int, struct toptenentry *, int));
-char *itoa __P((int));
-const char *ordin __P((int));
-void clearlocks __P((void));
-void hangup __P((int)) __attribute__((__noreturn__));
-char *eos __P((char *));
-void charcat __P((char *, int));
-void prscore __P((int, char **));
+int outentry(int, struct toptenentry *, int);
+char *itoa(int);
+const char *ordin(int);
+void clearlocks(void);
+void hangup(int) __attribute__((__noreturn__));
+char *eos(char *);
+void charcat(char *, int);
+void prscore(int, char **);
 
 /* hack.engrave.c */
-struct engr *engr_at __P((xchar, xchar));
-int sengr_at __P((const char *, xchar, xchar));
-void u_wipe_engr __P((int));
-void wipe_engr_at __P((xchar, xchar, xchar));
-void read_engr_at __P((int, int));
-void make_engr_at __P((int, int, const char *));
-int doengrave __P((void));
-void save_engravings __P((int));
-void rest_engravings __P((int));
-void del_engr __P((struct engr *));
+struct engr *engr_at(xchar, xchar);
+int sengr_at(const char *, xchar, xchar);
+void u_wipe_engr(int);
+void wipe_engr_at(xchar, xchar, xchar);
+void read_engr_at(int, int);
+void make_engr_at(int, int, const char *);
+int doengrave(void);
+void save_engravings(int);
+void rest_engravings(int);
+void del_engr(struct engr *);
 
 /* hack.fight.c */
-int hitmm __P((struct monst *, struct monst *));
-void mondied __P((struct monst *));
-void monstone __P((struct monst *));
-int fightm __P((struct monst *));
-int thitu __P((int, int, const char *));
-boolean hmon __P((struct monst *, struct obj *, int));
-int attack __P((struct monst *));
+int hitmm(struct monst *, struct monst *);
+void mondied(struct monst *);
+void monstone(struct monst *);
+int fightm(struct monst *);
+int thitu(int, int, const char *);
+boolean hmon(struct monst *, struct obj *, int);
+int attack(struct monst *);
 
 /* hack.invent.c */
-struct obj *addinv __P((struct obj *));
-void useup __P((struct obj *));
-void freeinv __P((struct obj *));
-void delobj __P((struct obj *));
-void freeobj __P((struct obj *));
-void freegold __P((struct gold *));
-void deltrap __P((struct trap *));
-struct monst *m_at __P((int, int));
-struct obj *o_at __P((int, int));
-struct obj *sobj_at __P((int, int, int));
-int carried __P((struct obj *));
-int carrying __P((int));
-struct obj *o_on __P((unsigned int, struct obj *));
-struct trap *t_at __P((int, int));
-struct gold *g_at __P((int, int));
-struct obj *mkgoldobj __P((long));
-struct obj *getobj __P((const char *, const char *));
-int ckunpaid __P((struct obj *));
-int ggetobj __P((const char *, int (*fn)(struct obj *), int));
-int askchain __P((struct obj *, char *, int, int (*)(struct obj *), 
-    int (*)(struct obj *), int));
-char obj_to_let __P((struct obj *));
-void prinv __P((struct obj *));
-int ddoinv __P((void));
-void doinv __P((char *));
-int dotypeinv __P((void));
-int dolook __P((void));
-void stackobj __P((struct obj *));
-int merged __P((struct obj *, struct obj *, int));
-int countgold __P((void));
-int doprgold __P((void));
-int doprwep __P((void));
-int doprarm __P((void));
-int doprring __P((void));
-int digit __P((int));
+struct obj *addinv(struct obj *);
+void useup(struct obj *);
+void freeinv(struct obj *);
+void delobj(struct obj *);
+void freeobj(struct obj *);
+void freegold(struct gold *);
+void deltrap(struct trap *);
+struct monst *m_at(int, int);
+struct obj *o_at(int, int);
+struct obj *sobj_at(int, int, int);
+int carried(struct obj *);
+int carrying(int);
+struct obj *o_on(unsigned int, struct obj *);
+struct trap *t_at(int, int);
+struct gold *g_at(int, int);
+struct obj *mkgoldobj(long);
+struct obj *getobj(const char *, const char *);
+int ckunpaid(struct obj *);
+int ggetobj(const char *, int (*fn)(struct obj *), int);
+int askchain(struct obj *, char *, int, int (*)(struct obj *), 
+    int (*)(struct obj *), int);
+char obj_to_let(struct obj *);
+void prinv(struct obj *);
+int ddoinv(void);
+void doinv(char *);
+int dotypeinv(void);
+int dolook(void);
+void stackobj(struct obj *);
+int merged(struct obj *, struct obj *, int);
+int countgold(void);
+int doprgold(void);
+int doprwep(void);
+int doprarm(void);
+int doprring(void);
+int digit(int);
 
 /* hack.ioctl.c */
-void getioctls __P((void));
-void setioctls __P((void));
-int dosuspend __P((void));
+void getioctls(void);
+void setioctls(void);
+int dosuspend(void);
 
 /* hack.lev.c */
-void savelev __P((int, xchar));
-void bwrite __P((int, const void *, unsigned));
-void saveobjchn __P((int, struct obj *));
-void savemonchn __P((int, struct monst *));
-void savegoldchn __P((int, struct gold *));
-void savetrapchn __P((int, struct trap *));
-void getlev __P((int, int, xchar));
-void mread __P((int, char *, unsigned));
-void mklev __P((void));
+void savelev(int, xchar);
+void bwrite(int, const void *, unsigned);
+void saveobjchn(int, struct obj *);
+void savemonchn(int, struct monst *);
+void savegoldchn(int, struct gold *);
+void savetrapchn(int, struct trap *);
+void getlev(int, int, xchar);
+void mread(int, char *, unsigned);
+void mklev(void);
 
 /* hack.main.c */
-void glo __P((int));
-void askname __P((void));
-void impossible __P((const char *, ...))
+void glo(int);
+void askname(void);
+void impossible(const char *, ...)
     __attribute__((__format__(__printf__, 1, 2)));
-void stop_occupation __P((void));
+void stop_occupation(void);
 
 /* hack.makemon.c */
-struct monst *makemon __P((const struct permonst *, int, int));
-coord enexto __P((xchar, xchar));
-int goodpos __P((int, int));
-void rloc __P((struct monst *));
-struct monst *mkmon_at __P((int, int, int));
+struct monst *makemon(const struct permonst *, int, int);
+coord enexto(xchar, xchar);
+int goodpos(int, int);
+void rloc(struct monst *);
+struct monst *mkmon_at(int, int, int);
 
 /* hack.mhitu.c */
-int mhitu __P((struct monst *));
-int hitu __P((struct monst *, int));
+int mhitu(struct monst *);
+int hitu(struct monst *, int);
 
 /* hack.mklev.c */
-void makelevel __P((void));
-int makerooms __P((void));
-void addrs __P((int, int, int, int));
-void addrsx __P((int, int, int, int, boolean));
+void makelevel(void);
+int makerooms(void);
+void addrs(int, int, int, int);
+void addrsx(int, int, int, int, boolean);
 struct mkroom;
-int comp __P((const void *, const void *));
-coord finddpos __P((int, int, int, int));
-int okdoor __P((int, int));
-void dodoor __P((int, int, struct mkroom *));
-void dosdoor __P((int, int, struct mkroom *, int));
-int maker __P((schar, schar, schar, schar));
-void makecorridors __P((void));
-void join __P((int, int));
-void make_niches __P((void));
-void makevtele __P((void));
-void makeniche __P((boolean));
-void mktrap __P((int, int, struct mkroom *));
+int comp(const void *, const void *);
+coord finddpos(int, int, int, int);
+int okdoor(int, int);
+void dodoor(int, int, struct mkroom *);
+void dosdoor(int, int, struct mkroom *, int);
+int maker(schar, schar, schar, schar);
+void makecorridors(void);
+void join(int, int);
+void make_niches(void);
+void makevtele(void);
+void makeniche(boolean);
+void mktrap(int, int, struct mkroom *);
 
 /* hack.mkmaze.c */
-void makemaz __P((void));
-void walkfrom __P((int, int));
-void move __P((int *, int *, int));
-int okay __P((int, int, int));
-coord mazexy __P((void));
+void makemaz(void);
+void walkfrom(int, int);
+void move(int *, int *, int);
+int okay(int, int, int);
+coord mazexy(void);
 
 /* hack.mkobj.c */
-struct obj *mkobj_at __P((int, int, int));
-void mksobj_at __P((int, int, int));
-struct obj *mkobj __P((int));
-struct obj *mksobj __P((int));
-int letter __P((int));
-int weight __P((struct obj *));
-void mkgold __P((long, int, int));
+struct obj *mkobj_at(int, int, int);
+void mksobj_at(int, int, int);
+struct obj *mkobj(int);
+struct obj *mksobj(int);
+int letter(int);
+int weight(struct obj *);
+void mkgold(long, int, int);
 
 /* hack.mkshop.c */
-void mkshop __P((void));
-void mkzoo __P((int));
-const struct permonst *morguemon __P((void));
-void mkswamp __P((void));
-int nexttodoor __P((int, int));
-int has_dnstairs __P((struct mkroom *));
-int has_upstairs __P((struct mkroom *));
-int isbig __P((struct mkroom *));
-int dist2 __P((int, int, int, int));
-int sq __P((int));
+void mkshop(void);
+void mkzoo(int);
+const struct permonst *morguemon(void);
+void mkswamp(void);
+int nexttodoor(int, int);
+int has_dnstairs(struct mkroom *);
+int has_upstairs(struct mkroom *);
+int isbig(struct mkroom *);
+int dist2(int, int, int, int);
+int sq(int);
 
 /* hack.mon.c */
-void movemon __P((void));
-void justswld __P((struct monst *, const char *));
-void youswld __P((struct monst *, int, int, const char *));
-int dochugw __P((struct monst *));
-int dochug __P((struct monst *));
-int m_move __P((struct monst *, int));
-void mpickgold __P((struct monst *));
-void mpickgems __P((struct monst *));
-int mfndpos __P((struct monst *, coord[9 ], int[9 ], int));
-int dist __P((int, int));
-void poisoned __P((const char *, const char *));
-void mondead __P((struct monst *));
-void replmon __P((struct monst *, struct monst *));
-void relmon __P((struct monst *));
-void monfree __P((struct monst *));
-void dmonsfree __P((void));
-void unstuck __P((struct monst *));
-void killed __P((struct monst *));
-void kludge __P((const char *, const char *));
-void rescham __P((void));
-int newcham __P((struct monst *, const struct permonst *));
-void mnexto __P((struct monst *));
-int ishuman __P((struct monst *));
-void setmangry __P((struct monst *));
-int canseemon __P((struct monst *));
+void movemon(void);
+void justswld(struct monst *, const char *);
+void youswld(struct monst *, int, int, const char *);
+int dochugw(struct monst *);
+int dochug(struct monst *);
+int m_move(struct monst *, int);
+void mpickgold(struct monst *);
+void mpickgems(struct monst *);
+int mfndpos(struct monst *, coord[9 ], int[9 ], int);
+int dist(int, int);
+void poisoned(const char *, const char *);
+void mondead(struct monst *);
+void replmon(struct monst *, struct monst *);
+void relmon(struct monst *);
+void monfree(struct monst *);
+void dmonsfree(void);
+void unstuck(struct monst *);
+void killed(struct monst *);
+void kludge(const char *, const char *);
+void rescham(void);
+int newcham(struct monst *, const struct permonst *);
+void mnexto(struct monst *);
+int ishuman(struct monst *);
+void setmangry(struct monst *);
+int canseemon(struct monst *);
 
 /* hack.monst.c */
 
 /* hack.o_init.c */
-int letindex __P((int));
-void init_objects __P((void));
-int probtype __P((int));
-void setgemprobs __P((void));
-void oinit __P((void));
-void savenames __P((int));
-void restnames __P((int));
-int dodiscovered __P((void));
-int interesting_to_discover __P((int));
+int letindex(int);
+void init_objects(void);
+int probtype(int);
+void setgemprobs(void);
+void oinit(void);
+void savenames(int);
+void restnames(int);
+int dodiscovered(void);
+int interesting_to_discover(int);
 
 /* hack.objnam.c */
-char *strprepend __P((char *, char *));
-char *sitoa __P((int));
-char *typename __P((int));
-char *xname __P((struct obj *));
-char *doname __P((struct obj *));
-void setan __P((const char *, char *));
-char *aobjnam __P((struct obj *, const char *));
-char *Doname __P((struct obj *));
-struct obj *readobjnam __P((char *));
+char *strprepend(char *, char *);
+char *sitoa(int);
+char *typename(int);
+char *xname(struct obj *);
+char *doname(struct obj *);
+void setan(const char *, char *);
+char *aobjnam(struct obj *, const char *);
+char *Doname(struct obj *);
+struct obj *readobjnam(char *);
 
 /* hack.options.c */
-void initoptions __P((void));
-void parseoptions __P((char *, boolean));
-int doset __P((void));
+void initoptions(void);
+void parseoptions(char *, boolean);
+int doset(void);
 
 /* hack.pager.c */
-int dowhatis __P((void));
-void intruph __P((int));
-void page_more __P((FILE *, int));
-void set_whole_screen __P((void));
-int readnews __P((void));
-void set_pager __P((int));
-int page_line __P((const char *));
-void cornline __P((int, const char *));
-int dohelp __P((void));
-int page_file __P((const char *, boolean));
-int dosh __P((void));
-int child __P((int));
+int dowhatis(void);
+void intruph(int);
+void page_more(FILE *, int);
+void set_whole_screen(void);
+int readnews(void);
+void set_pager(int);
+int page_line(const char *);
+void cornline(int, const char *);
+int dohelp(void);
+int page_file(const char *, boolean);
+int dosh(void);
+int child(int);
 
 /* hack.potion.c */
-int dodrink __P((void));
-void pluslvl __P((void));
-void strange_feeling __P((struct obj *, const char *));
-void potionhit __P((struct monst *, struct obj *));
-void potionbreathe __P((struct obj *));
-int dodip __P((void));
-void ghost_from_bottle __P((void));
+int dodrink(void);
+void pluslvl(void);
+void strange_feeling(struct obj *, const char *);
+void potionhit(struct monst *, struct obj *);
+void potionbreathe(struct obj *);
+int dodip(void);
+void ghost_from_bottle(void);
 
 /* hack.pri.c */
-void swallowed __P((void));
-void panic __P((const char *, ...))
+void swallowed(void);
+void panic(const char *, ...)
     __attribute__((__format__(__printf__, 1, 2)));
-void atl __P((int, int, int));
-void on_scr __P((int, int));
-void tmp_at __P((schar, schar));
-void Tmp_at __P((schar, schar));
-void setclipped __P((void)) __attribute__((__noreturn__));
-void at __P((xchar, xchar, int));
-void prme __P((void));
-int doredraw __P((void));
-void docrt __P((void));
-void docorner __P((int, int));
-void curs_on_u __P((void));
-void pru __P((void));
-void prl __P((int, int));
-char news0 __P((xchar, xchar));
-void newsym __P((int, int));
-void mnewsym __P((int, int));
-void nosee __P((int, int));
-void prl1 __P((int, int));
-void nose1 __P((int, int));
-int vism_at __P((int, int));
-void pobj __P((struct obj *));
-void unpobj __P((struct obj *));
-void seeobjs __P((void));
-void seemons __P((void));
-void pmon __P((struct monst *));
-void unpmon __P((struct monst *));
-void nscr __P((void));
-void cornbot __P((int));
-void bot __P((void));
-void mstatusline __P((struct monst *));
-void cls __P((void));
+void atl(int, int, int);
+void on_scr(int, int);
+void tmp_at(schar, schar);
+void Tmp_at(schar, schar);
+void setclipped(void) __attribute__((__noreturn__));
+void at(xchar, xchar, int);
+void prme(void);
+int doredraw(void);
+void docrt(void);
+void docorner(int, int);
+void curs_on_u(void);
+void pru(void);
+void prl(int, int);
+char news0(xchar, xchar);
+void newsym(int, int);
+void mnewsym(int, int);
+void nosee(int, int);
+void prl1(int, int);
+void nose1(int, int);
+int vism_at(int, int);
+void pobj(struct obj *);
+void unpobj(struct obj *);
+void seeobjs(void);
+void seemons(void);
+void pmon(struct monst *);
+void unpmon(struct monst *);
+void nscr(void);
+void cornbot(int);
+void bot(void);
+void mstatusline(struct monst *);
+void cls(void);
 
 /* hack.read.c */
-int doread __P((void));
-int identify __P((struct obj *));
-void litroom __P((boolean));
-int monstersym __P((int));
+int doread(void);
+int identify(struct obj *);
+void litroom(boolean);
+int monstersym(int);
 
 /* hack.rip.c */
-void outrip __P((void));
-void center __P((int, char *));
+void outrip(void);
+void center(int, char *);
 
 /* hack.rumors.c */
-void init_rumors __P((FILE *));
-int skipline __P((FILE *));
-void outline __P((FILE *));
-void outrumor __P((void));
-int used __P((int));
+void init_rumors(FILE *);
+int skipline(FILE *);
+void outline(FILE *);
+void outrumor(void);
+int used(int);
 
 /* hack.save.c */
-int dosave __P((void));
-int dosave0 __P((int));
-int dorecover __P((int));
-struct obj *restobjchn __P((int));
-struct monst *restmonchn __P((int));
+int dosave(void);
+int dosave0(int);
+int dorecover(int);
+struct obj *restobjchn(int);
+struct monst *restmonchn(int);
 
 /* hack.search.c */
-int findit __P((void));
-int dosearch __P((void));
-int doidtrap __P((void));
-void wakeup __P((struct monst *));
-void seemimic __P((struct monst *));
+int findit(void);
+int dosearch(void);
+int doidtrap(void);
+void wakeup(struct monst *);
+void seemimic(struct monst *);
 
 /* hack.shk.c */
-void obfree __P((struct obj *, struct obj *));
-void paybill __P((void));
-char *shkname __P((struct monst *));
-void shkdead __P((struct monst *));
-void replshk __P((struct monst *, struct monst *));
-int inshop __P((void));
-int dopay __P((void));
+void obfree(struct obj *, struct obj *);
+void paybill(void);
+char *shkname(struct monst *);
+void shkdead(struct monst *);
+void replshk(struct monst *, struct monst *);
+int inshop(void);
+int dopay(void);
 struct bill_x;
-struct obj *bp_to_obj __P((struct bill_x *));
-void addtobill __P((struct obj *));
-void splitbill __P((struct obj *, struct obj *));
-void subfrombill __P((struct obj *));
-int doinvbill __P((int));
-int shkcatch __P((struct obj *));
-int shk_move __P((struct monst *));
-void shopdig __P((int));
-int online __P((int, int));
-int follower __P((struct monst *));
+struct obj *bp_to_obj(struct bill_x *);
+void addtobill(struct obj *);
+void splitbill(struct obj *, struct obj *);
+void subfrombill(struct obj *);
+int doinvbill(int);
+int shkcatch(struct obj *);
+int shk_move(struct monst *);
+void shopdig(int);
+int online(int, int);
+int follower(struct monst *);
 
 /* hack.shknam.c */
-void findname __P((char *, int));
+void findname(char *, int);
 
 /* hack.steal.c */
-long somegold __P((void));
-void stealgold __P((struct monst *));
-int stealarm __P((void));
-int steal __P((struct monst *));
-void mpickobj __P((struct monst *, struct obj *));
-int stealamulet __P((struct monst *));
-void relobj __P((struct monst *, int));
+long somegold(void);
+void stealgold(struct monst *);
+int stealarm(void);
+int steal(struct monst *);
+void mpickobj(struct monst *, struct obj *);
+int stealamulet(struct monst *);
+void relobj(struct monst *, int);
 
 /* hack.termcap.c */
-void startup __P((void));
-void start_screen __P((void));
-void end_screen __P((void));
-void curs __P((int, int));
-void nocmov __P((int, int));
-void cmov __P((int, int));
-int xputc __P((int));
-void xputs __P((char *));
-void cl_end __P((void));
-void clear_screen __P((void));
-void home __P((void));
-void standoutbeg __P((void));
-void standoutend __P((void));
-void backsp __P((void));
-void bell __P((void));
-void delay_output __P((void));
-void cl_eos __P((void));
+void startup(void);
+void start_screen(void);
+void end_screen(void);
+void curs(int, int);
+void nocmov(int, int);
+void cmov(int, int);
+int xputc(int);
+void xputs(char *);
+void cl_end(void);
+void clear_screen(void);
+void home(void);
+void standoutbeg(void);
+void standoutend(void);
+void backsp(void);
+void bell(void);
+void delay_output(void);
+void cl_eos(void);
 
 /* hack.timeout.c */
-void timeout __P((void));
-void stoned_dialogue __P((void));
+void timeout(void);
+void stoned_dialogue(void);
 
 /* hack.topl.c */
-int doredotopl __P((void));
-void redotoplin __P((void));
-void remember_topl __P((void));
-void addtopl __P((const char *));
-void xmore __P((const char *));
-void more __P((void));
-void cmore __P((const char *));
-void clrlin __P((void));
-void pline __P((const char *, ...))
+int doredotopl(void);
+void redotoplin(void);
+void remember_topl(void);
+void addtopl(const char *);
+void xmore(const char *);
+void more(void);
+void cmore(const char *);
+void clrlin(void);
+void pline(const char *, ...)
     __attribute__((__format__(__printf__, 1, 2)));
-void vpline __P((const char *, va_list))
+void vpline(const char *, va_list)
     __attribute__((__format__(__printf__, 1, 0)));
-void putsym __P((int));
-void putstr __P((const char *));
+void putsym(int);
+void putstr(const char *);
 
 /* hack.track.c */
-void initrack __P((void));
-void settrack __P((void));
-coord *gettrack __P((int, int));
+void initrack(void);
+void settrack(void);
+coord *gettrack(int, int);
 
 /* hack.trap.c */
-struct trap *maketrap __P((int, int, int));
-void dotrap __P((struct trap *));
-int mintrap __P((struct monst *));
-void selftouch __P((const char *));
-void float_up __P((void));
-void float_down __P((void));
-void vtele __P((void));
-void tele __P((void));
-void teleds __P((int, int));
-int teleok __P((int, int));
-int dotele __P((void));
-void placebc __P((int));
-void unplacebc __P((void));
-void level_tele __P((void));
-void drown __P((void));
+struct trap *maketrap(int, int, int);
+void dotrap(struct trap *);
+int mintrap(struct monst *);
+void selftouch(const char *);
+void float_up(void);
+void float_down(void);
+void vtele(void);
+void tele(void);
+void teleds(int, int);
+int teleok(int, int);
+int dotele(void);
+void placebc(int);
+void unplacebc(void);
+void level_tele(void);
+void drown(void);
 
 /* hack.tty.c */
-void gettty __P((void));
-void settty __P((const char *));
-void setctty __P((void));
-void setftty __P((void));
-void error __P((const char *, ...))
+void gettty(void);
+void settty(const char *);
+void setctty(void);
+void setftty(void);
+void error(const char *, ...)
     __attribute__((__format__(__printf__, 1, 2),__noreturn__));
-void getlin __P((char *));
-void getret __P((void));
-void cgetret __P((const char *));
-void xwaitforspace __P((const char *));
-char *parse __P((void));
-char readchar __P((void));
-void end_of_input __P((void)) __attribute__((__noreturn__));
+void getlin(char *);
+void getret(void);
+void cgetret(const char *);
+void xwaitforspace(const char *);
+char *parse(void);
+char readchar(void);
+void end_of_input(void) __attribute__((__noreturn__));
 
 /* hack.u_init.c */
-void u_init __P((void));
+void u_init(void);
 struct trobj;
-void ini_inv __P((struct trobj *));
-void wiz_inv __P((void));
-void plnamesuffix __P((void));
-int role_index __P((int));
+void ini_inv(struct trobj *);
+void wiz_inv(void);
+void plnamesuffix(void);
+int role_index(int);
 
 /* hack.unix.c */
-void setrandom __P((void));
-struct tm *getlt __P((void));
-int getyear __P((void));
-char *getdate __P((void));
-int phase_of_the_moon __P((void));
-int night __P((void));
-int midnight __P((void));
-void gethdate __P((char *));
-int uptodate __P((int));
-int veryold __P((int));
-void getlock __P((void));
-void getmailstatus __P((void));
-void ckmailstatus __P((void));
-void newmail __P((void));
-void mdrush __P((struct monst *, boolean));
-void readmail __P((void));
-void regularize __P((char *));
+void setrandom(void);
+struct tm *getlt(void);
+int getyear(void);
+char *getdate(void);
+int phase_of_the_moon(void);
+int night(void);
+int midnight(void);
+void gethdate(char *);
+int uptodate(int);
+int veryold(int);
+void getlock(void);
+void getmailstatus(void);
+void ckmailstatus(void);
+void newmail(void);
+void mdrush(struct monst *, boolean);
+void readmail(void);
+void regularize(char *);
 
 /* hack.vault.c */
-void setgd __P((void));
-int gd_move __P((void));
-void gddead __P((void));
-void replgd __P((struct monst *, struct monst *));
-void invault __P((void));
+void setgd(void);
+int gd_move(void);
+void gddead(void);
+void replgd(struct monst *, struct monst *);
+void invault(void);
 
 /* hack.version.c */
-int doversion __P((void));
+int doversion(void);
 
 /* hack.wield.c */
-void setuwep __P((struct obj *));
-int dowield __P((void));
-void corrode_weapon __P((void));
-int chwepon __P((struct obj *, int));
+void setuwep(struct obj *);
+int dowield(void);
+void corrode_weapon(void);
+int chwepon(struct obj *, int);
 
 /* hack.wizard.c */
-void amulet __P((void));
-int wiz_hit __P((struct monst *));
-void inrange __P((struct monst *));
-void aggravate __P((void));
-void clonewiz __P((struct monst *));
+void amulet(void);
+int wiz_hit(struct monst *);
+void inrange(struct monst *);
+void aggravate(void);
+void clonewiz(struct monst *);
 
 /* hack.worm.c */
 #ifndef NOWORM
-int getwn __P((struct monst *));
-void initworm __P((struct monst *));
-void worm_move __P((struct monst *));
-void worm_nomove __P((struct monst *));
-void wormdead __P((struct monst *));
-void wormhit __P((struct monst *));
-void wormsee __P((unsigned));
+int getwn(struct monst *);
+void initworm(struct monst *);
+void worm_move(struct monst *);
+void worm_nomove(struct monst *);
+void wormdead(struct monst *);
+void wormhit(struct monst *);
+void wormsee(unsigned);
 struct wseg;
-void pwseg __P((struct wseg *));
-void cutworm __P((struct monst *, xchar, xchar, uchar));
-void remseg __P((struct wseg *));
+void pwseg(struct wseg *);
+void cutworm(struct monst *, xchar, xchar, uchar);
+void remseg(struct wseg *);
 #endif
 
 /* hack.worn.c */
-void setworn __P((struct obj *, long));
-void setnotworn __P((struct obj *));
+void setworn(struct obj *, long);
+void setnotworn(struct obj *);
 
 /* hack.zap.c */
-void bhitm __P((struct monst *, struct obj *));
-int bhito __P((struct obj *, struct obj *));
-int dozap __P((void));
-const char *exclam __P((int));
-void hit __P((const char *, struct monst *, const char *));
-void miss __P((const char *, struct monst *));
-struct monst *bhit __P((int, int, int, int,
+void bhitm(struct monst *, struct obj *);
+int bhito(struct obj *, struct obj *);
+int dozap(void);
+const char *exclam(int);
+void hit(const char *, struct monst *, const char *);
+void miss(const char *, struct monst *);
+struct monst *bhit(int, int, int, int,
     void (*)(struct monst *, struct obj *),
     int (*)(struct obj *, struct obj *),
-    struct obj *));
-struct monst *boomhit __P((int, int));
-char dirlet __P((int, int));
-void buzz __P((int, xchar, xchar, int, int));
-int zhit __P((struct monst *, int));
-int revive __P((struct obj *));
-void rloco __P((struct obj *));
-void fracture_rock __P((struct obj *));
-void burn_scrolls __P((void));
+    struct obj *);
+struct monst *boomhit(int, int);
+char dirlet(int, int);
+void buzz(int, xchar, xchar, int, int);
+int zhit(struct monst *, int);
+int revive(struct obj *);
+void rloco(struct obj *);
+void fracture_rock(struct obj *);
+void burn_scrolls(void);
 
 /* rnd.c */
-int rn1 __P((int, int));
-int rn2 __P((int));
-int rnd __P((int));
-int d __P((int, int));
+int rn1(int, int);
+int rn2(int);
+int rnd(int);
+int d(int, int);
 #endif /* _EXTERN_H_ */
diff --git a/hack/hack.apply.c b/hack/hack.apply.c
index 91a222be..391cbf41 100644
--- a/hack/hack.apply.c
+++ b/hack/hack.apply.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.apply.c,v 1.7 2003/04/02 18:36:35 jsm Exp $	*/
+/*	$NetBSD: hack.apply.c,v 1.8 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.apply.c,v 1.7 2003/04/02 18:36:35 jsm Exp $");
+__RCSID("$NetBSD: hack.apply.c,v 1.8 2004/01/27 20:30:29 jsm Exp $");
 #endif				/* not lint */
 
 #include	"hack.h"
@@ -71,16 +71,16 @@ __RCSID("$NetBSD: hack.apply.c,v 1.7 2003/04/02 18:36:35 jsm Exp $");
 #include	"def.edog.h"
 #include	"def.mkroom.h"
 
-static void use_camera __P((struct obj *));
-static int in_ice_box __P((struct obj *));
-static int ck_ice_box __P((struct obj *));
-static int out_ice_box __P((struct obj *));
-static void use_ice_box __P((struct obj *));
-static struct monst *bchit __P((int, int , int , int));
-static void use_whistle __P((struct obj *));
-static void use_magic_whistle __P((struct obj *));
-static int dig __P((void));
-static int use_pick_axe __P((struct obj *));
+static void use_camera(struct obj *);
+static int in_ice_box(struct obj *);
+static int ck_ice_box(struct obj *);
+static int out_ice_box(struct obj *);
+static void use_ice_box(struct obj *);
+static struct monst *bchit(int, int , int , int);
+static void use_whistle(struct obj *);
+static void use_magic_whistle(struct obj *);
+static int dig(void);
+static int use_pick_axe(struct obj *);
 
 int
 doapply()
diff --git a/hack/hack.do.c b/hack/hack.do.c
index c02be1d3..b606edad 100644
--- a/hack/hack.do.c
+++ b/hack/hack.do.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.do.c,v 1.6 2003/04/02 18:36:35 jsm Exp $	*/
+/*	$NetBSD: hack.do.c,v 1.7 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.do.c,v 1.6 2003/04/02 18:36:35 jsm Exp $");
+__RCSID("$NetBSD: hack.do.c,v 1.7 2004/01/27 20:30:29 jsm Exp $");
 #endif				/* not lint */
 
 /* Contains code for 'd', 'D' (drop), '>', '<' (up, down) and 't' (throw) */
@@ -75,7 +75,7 @@ __RCSID("$NetBSD: hack.do.c,v 1.6 2003/04/02 18:36:35 jsm Exp $");
 #include <stdlib.h>
 
 
-static int drop __P((struct obj *));
+static int drop(struct obj *);
 
 int
 dodrop()
@@ -406,8 +406,8 @@ dothrow()
 		mon = bhit(u.dx, u.dy, (obj->otyp == ICE_BOX) ? 1 :
 			(!Punished || obj != uball) ? 8 : !u.ustuck ? 5 : 1,
 			   obj->olet,
-			   (void (*) __P((struct monst *, struct obj *))) 0,
-			   (int (*) __P((struct obj *, struct obj *))) 0, obj);
+			   (void (*)(struct monst *, struct obj *)) 0,
+			   (int (*)(struct obj *, struct obj *)) 0, obj);
 	}
 	if (mon) {
 		/* awake monster if sleeping */
diff --git a/hack/hack.h b/hack/hack.h
index b088690f..9ca5d821 100644
--- a/hack/hack.h
+++ b/hack/hack.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.h,v 1.9 2003/04/02 18:36:37 jsm Exp $	*/
+/*	$NetBSD: hack.h,v 1.10 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -110,7 +110,7 @@ struct prop {
 #define	RIGHT_SIDE	RIGHT_RING
 #define	BOTH_SIDES	(LEFT_SIDE | RIGHT_SIDE)
 	long p_flgs;
-	void (*p_tofn) __P((void));	/* called after timeout */
+	void (*p_tofn)(void);	/* called after timeout */
 };
 
 struct you {
@@ -212,8 +212,8 @@ extern char sdir[]; /* defined in hack.c */
 extern const char shtypes[]; /* = "=/)%?!["; 8 types: 7 specialized, 1 mixed */
 extern const char vowels[];
 extern coord bhitpos;	/* place where thrown weapon falls to the ground */
-extern int (*afternmv) __P((void));
-extern int (*occupation) __P((void));
+extern int (*afternmv)(void);
+extern int (*occupation)(void);
 extern int CO, LI; /* usually COLNO and ROWNO+2 */
 extern int bases[];
 extern int doorindex;
diff --git a/hack/hack.invent.c b/hack/hack.invent.c
index d4a7d2e6..c33d502b 100644
--- a/hack/hack.invent.c
+++ b/hack/hack.invent.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.invent.c,v 1.8 2003/04/02 18:36:37 jsm Exp $	*/
+/*	$NetBSD: hack.invent.c,v 1.9 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.invent.c,v 1.8 2003/04/02 18:36:37 jsm Exp $");
+__RCSID("$NetBSD: hack.invent.c,v 1.9 2004/01/27 20:30:29 jsm Exp $");
 #endif				/* not lint */
 
 #include <stdlib.h>
@@ -78,8 +78,8 @@ __RCSID("$NetBSD: hack.invent.c,v 1.8 2003/04/02 18:36:37 jsm Exp $");
 
 static int      lastinvnr = 51;	/* 0 ... 51 */
 
-static void assigninvlet __P((struct obj *));
-static char *xprname __P((struct obj *, char));
+static void assigninvlet(struct obj *);
+static char *xprname(struct obj *, char);
 
 static void
 assigninvlet(otmp)
@@ -566,7 +566,7 @@ ckunpaid(otmp)
 int
 ggetobj(word, fn, max)
 	const char *word;
-	int (*fn)  __P((struct obj *));
+	int (*fn)(struct obj *);
 	int max;
 {
 	char            buf[BUFSZ];
@@ -575,8 +575,8 @@ ggetobj(word, fn, max)
 	int             oletct = 0, iletct = 0;
 	boolean         allflag = FALSE;
 	char            olets[20], ilets[20];
-	int           (*ckfn) __P((struct obj *)) =
-	    (int (*) __P((struct obj *))) 0;
+	int           (*ckfn)(struct obj *) =
+	    (int (*)(struct obj *)) 0;
 	xchar           allowgold = (u.ugold && !strcmp(word, "drop")) ? 1 : 0;	/* BAH */
 	if (!invent && !allowgold) {
 		pline("You have nothing to %s.", word);
@@ -652,8 +652,8 @@ askchain(objchn, olets, allflag, fn, ckfn, max)
 	struct obj     *objchn;
 	char           *olets;
 	int             allflag;
-	int           (*fn) __P((struct obj *));
-	int	      (*ckfn) __P((struct obj *));
+	int           (*fn)(struct obj *);
+	int	      (*ckfn)(struct obj *);
 	int             max;
 {
 	struct obj     *otmp, *otmp2;
diff --git a/hack/hack.main.c b/hack/hack.main.c
index 7e399193..930de44d 100644
--- a/hack/hack.main.c
+++ b/hack/hack.main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.main.c,v 1.8 2003/04/02 18:36:37 jsm Exp $	*/
+/*	$NetBSD: hack.main.c,v 1.9 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.main.c,v 1.8 2003/04/02 18:36:37 jsm Exp $");
+__RCSID("$NetBSD: hack.main.c,v 1.9 2004/01/27 20:30:29 jsm Exp $");
 #endif				/* not lint */
 
 #include <signal.h>
@@ -79,8 +79,8 @@ __RCSID("$NetBSD: hack.main.c,v 1.8 2003/04/02 18:36:37 jsm Exp $");
 #define	gamename	"hack"
 #endif
 
-int             (*afternmv)  __P((void));
-int             (*occupation)  __P((void));
+int             (*afternmv)(void);
+int             (*occupation)(void);
 const char           *occtxt;		/* defined when occupation != NULL */
 
 int             hackpid;	/* current pid */
@@ -92,8 +92,8 @@ char            SAVEF[PL_NSIZ + 11] = "save/";	/* save/99999player */
 char           *hname;		/* name of the game (argv[0] of call) */
 char            obuf[BUFSIZ];	/* BUFSIZ is defined in stdio.h */
 
-int main __P((int, char *[]));
-static void chdirx __P((const char *, boolean));
+int main(int, char *[]);
+static void chdirx(const char *, boolean);
 
 int
 main(argc, argv)
diff --git a/hack/hack.shk.c b/hack/hack.shk.c
index 2e826bd7..ee066530 100644
--- a/hack/hack.shk.c
+++ b/hack/hack.shk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.shk.c,v 1.6 2003/04/02 18:36:40 jsm Exp $	*/
+/*	$NetBSD: hack.shk.c,v 1.7 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.shk.c,v 1.6 2003/04/02 18:36:40 jsm Exp $");
+__RCSID("$NetBSD: hack.shk.c,v 1.7 2004/01/27 20:30:29 jsm Exp $");
 #endif				/* not lint */
 
 #include <stdlib.h>
@@ -71,14 +71,14 @@ __RCSID("$NetBSD: hack.shk.c,v 1.6 2003/04/02 18:36:40 jsm Exp $");
 #include "extern.h"
 
 #ifndef QUEST
-static void setpaid __P((void));
-static void addupbill __P((void));
-static void findshk __P((int));
-static struct bill_x *onbill __P((struct obj *));
-static void pay __P((long, struct monst *));
-static int dopayobj __P((struct bill_x *));
-static int getprice __P((struct obj *));
-static int realhunger __P((void));
+static void setpaid(void);
+static void addupbill(void);
+static void findshk(int);
+static struct bill_x *onbill(struct obj *);
+static void pay(long, struct monst *);
+static int dopayobj(struct bill_x *);
+static int getprice(struct obj *);
+static int realhunger(void);
 #endif
 
 #ifdef QUEST
diff --git a/hack/hack.vault.c b/hack/hack.vault.c
index d2fdb60b..f312bf10 100644
--- a/hack/hack.vault.c
+++ b/hack/hack.vault.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.vault.c,v 1.6 2003/04/02 18:36:41 jsm Exp $	*/
+/*	$NetBSD: hack.vault.c,v 1.7 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.vault.c,v 1.6 2003/04/02 18:36:41 jsm Exp $");
+__RCSID("$NetBSD: hack.vault.c,v 1.7 2004/01/27 20:30:29 jsm Exp $");
 #endif				/* not lint */
 
 #include "hack.h"
@@ -114,8 +114,8 @@ static struct monst *guard;
 static int      gdlevel;
 #define	EGD	((struct egd *)(&(guard->mextra[0])))
 
-static void restfakecorr __P((void));
-static int goldincorridor __P((void));
+static void restfakecorr(void);
+static int goldincorridor(void);
 
 static void
 restfakecorr()
diff --git a/hack/hack.zap.c b/hack/hack.zap.c
index afddab14..e974d2b1 100644
--- a/hack/hack.zap.c
+++ b/hack/hack.zap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.zap.c,v 1.6 2003/04/02 18:36:42 jsm Exp $	*/
+/*	$NetBSD: hack.zap.c,v 1.7 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.zap.c,v 1.6 2003/04/02 18:36:42 jsm Exp $");
+__RCSID("$NetBSD: hack.zap.c,v 1.7 2004/01/27 20:30:29 jsm Exp $");
 #endif				/* not lint */
 
 #include "hack.h"
@@ -386,8 +386,8 @@ bhit(ddx, ddy, range, sym, fhitm, fhito, obj)
 	int             ddx, ddy, range;	/* direction and range */
 	char            sym;	/* symbol displayed on path */
 	/* fns called when mon/obj hit */
-	void          (*fhitm) __P((struct monst *, struct obj *));
-	int	      (*fhito) __P((struct obj *, struct obj *));
+	void          (*fhitm)(struct monst *, struct obj *);
+	int	      (*fhito)(struct obj *, struct obj *);
 	struct obj     *obj;	/* 2nd arg to fhitm/fhito */
 {
 	struct monst   *mtmp;