From: nhmall <nhmall@nethack.org>
Date: Sun, 31 Jan 2021 18:40:15 +0000 (-0500)
Subject: FDECL, NDECL in outdated
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=979571e09ece4a4786fe75861882a78fb92e35d4;p=nethack

FDECL, NDECL in outdated
---

diff --git a/outdated/include/amiconf.h b/outdated/include/amiconf.h
index 477c9248a..a23a56f0a 100644
--- a/outdated/include/amiconf.h
+++ b/outdated/include/amiconf.h
@@ -82,34 +82,34 @@ typedef long off_t;
 
 /* ### amidos.c ### */
 
-extern void FDECL(nethack_exit, (int));
+extern void nethack_exit(int);
 
 /* ### amiwbench.c ### */
 
-extern void NDECL(ami_wbench_init);
-extern void NDECL(ami_wbench_args);
-extern int FDECL(ami_wbench_getsave, (int));
-extern void FDECL(ami_wbench_unlink, (char *));
-extern int FDECL(ami_wbench_iconsize, (char *));
-extern void FDECL(ami_wbench_iconwrite, (char *));
-extern int FDECL(ami_wbench_badopt, (const char *));
-extern void NDECL(ami_wbench_cleanup);
-extern void FDECL(getlind, (const char *, char *, const char *));
+extern void ami_wbench_init(void);
+extern void ami_wbench_args(void);
+extern int ami_wbench_getsave(int);
+extern void ami_wbench_unlink(char *);
+extern int ami_wbench_iconsize(char *);
+extern void ami_wbench_iconwrite(char *);
+extern int ami_wbench_badopt(const char *);
+extern void ami_wbench_cleanup(void);
+extern void getlind(const char *, char *, const char *);
 
 /* ### winreq.c ### */
 
 extern void amii_setpens(int);
 
-extern void FDECL(exit, (int));
-extern void NDECL(CleanUp);
-extern void FDECL(Abort, (long));
-extern int NDECL(getpid);
-extern char *FDECL(CopyFile, (const char *, const char *));
-extern int NDECL(kbhit);
-extern int NDECL(WindowGetchar);
-extern void FDECL(ami_argset, (int *, char *[]));
-extern void FDECL(ami_mkargline, (int *, char **[]));
-extern void FDECL(ami_wininit_data, (int));
+extern void exit(int);
+extern void CleanUp(void);
+extern void Abort(long);
+extern int getpid(void);
+extern char *CopyFile(const char *, const char *);
+extern int kbhit(void);
+extern int WindowGetchar(void);
+extern void ami_argset(int *, char *[]);
+extern void ami_mkargline(int *, char **[]);
+extern void ami_wininit_data(int);
 
 #define FromWBench 0 /* A hint for compiler ... */
 /* extern boolean FromWBench;	/* how were we run? */
@@ -132,8 +132,8 @@ extern char **ami_argv;
 #endif
 
 #ifdef AZTEC_C
-extern FILE *FDECL(freopen, (const char *, const char *, FILE *));
-extern char *FDECL(gets, (char *));
+extern FILE *freopen(const char *, const char *, FILE *);
+extern char *gets(char *);
 #endif
 
 /*
@@ -191,7 +191,7 @@ extern int amibbs; /* BBS mode? */
 
 #ifdef AMII_GRAPHICS
 extern int amii_numcolors;
-void FDECL(amii_setpens, (int));
+void amii_setpens(int);
 #endif
 
 /* for cmd.c: override version in micro.h */
diff --git a/outdated/include/macwin.h b/outdated/include/macwin.h
index 8dad9ea57..1e017ae2b 100644
--- a/outdated/include/macwin.h
+++ b/outdated/include/macwin.h
@@ -167,7 +167,7 @@ extern Boolean RetrievePosition(short, short *, short *);
 extern Boolean RetrieveSize(short, short, short, short *, short *);
 extern void SaveWindowPos(WindowPtr);
 extern void SaveWindowSize(WindowPtr);
-extern Boolean FDECL(RetrieveWinPos, (WindowPtr, short *, short *));
+extern Boolean RetrieveWinPos(WindowPtr, short *, short *);
 
 /* ### macerrs.c ### */
 
@@ -183,8 +183,8 @@ extern void popattempt(void);
 /* ### macfile.c ### */
 
 /* extern char *macgets(int fd, char *ptr, unsigned len); unused */
-extern void FDECL(C2P, (const char *c, unsigned char *p));
-extern void FDECL(P2C, (const unsigned char *p, char *c));
+extern void C2P(const char *c, unsigned char *p);
+extern void P2C(const unsigned char *p, char *c);
 
 /* ### macmenu.c ### */
 
@@ -196,51 +196,51 @@ extern void AdjustMenus(short);
 
 /* ### macmain.c ### */
 
-extern void FDECL(process_openfile,
-                  (short s_vol, long s_dir, Str255 fNm, OSType ft));
+extern void process_openfile(short s_vol, long s_dir, Str255 fNm,
+                             OSType ft);
 
 /* ### macwin.c ### */
 
 extern void AddToKeyQueue(unsigned char, Boolean);
 extern unsigned char GetFromKeyQueue(void);
 void trans_num_keys(EventRecord *);
-extern void NDECL(InitMac);
-int FDECL(try_key_queue, (char *));
-void FDECL(enter_topl_mode, (char *));
-void FDECL(leave_topl_mode, (char *));
-void FDECL(topl_set_resp, (char *, char));
-Boolean FDECL(topl_key, (unsigned char, Boolean));
-E void FDECL(HandleEvent, (EventRecord *)); /* used in mmodal.c */
-extern void NDECL(port_help);
+extern void InitMac(void);
+int try_key_queue(char *);
+void enter_topl_mode(char *);
+void leave_topl_mode(char *);
+void topl_set_resp(char *, char);
+Boolean topl_key(unsigned char, Boolean);
+E void HandleEvent(EventRecord *); /* used in mmodal.c */
+extern void port_help(void);
 
 extern Boolean small_screen;
 
-E void FDECL(mac_init_nhwindows, (int *, char **));
-E void NDECL(mac_askname);
-E void NDECL(mac_get_nh_event);
-E void FDECL(mac_exit_nhwindows, (const char *));
-E winid FDECL(mac_create_nhwindow, (int));
-E void FDECL(mac_clear_nhwindow, (winid));
-E void FDECL(mac_display_nhwindow, (winid, BOOLEAN_P));
-E void FDECL(mac_destroy_nhwindow, (winid));
-E void FDECL(mac_curs, (winid, int, int));
-E void FDECL(mac_putstr, (winid, int, const char *));
-E void FDECL(mac_start_menu, (winid, unsigned long mbehavior));
-E void FDECL(mac_add_menu, (winid, int, const anything *, CHAR_P, CHAR_P, int,
-                            const char *, unsigned int));
-E void FDECL(mac_end_menu, (winid, const char *));
-E int FDECL(mac_select_menu, (winid, int, menu_item **));
+E void mac_init_nhwindows(int *, char **);
+E void mac_askname(void);
+E void mac_get_nh_event(void);
+E void mac_exit_nhwindows(const char *);
+E winid mac_create_nhwindow(int);
+E void mac_clear_nhwindow(winid);
+E void mac_display_nhwindow(winid, BOOLEAN_P);
+E void mac_destroy_nhwindow(winid);
+E void mac_curs(winid, int, int);
+E void mac_putstr(winid, int, const char *);
+E void mac_start_menu(winid, unsigned long mbehavior);
+E void mac_add_menu(winid, int, const anything *, CHAR_P, CHAR_P, int,
+                    const char *, unsigned int);
+E void mac_end_menu(winid, const char *);
+E int mac_select_menu(winid, int, menu_item **);
 #ifdef CLIPPING
-E void FDECL(mac_cliparound, (int, int));
+E void mac_cliparound(int, int);
 #endif
-E int NDECL(mac_nhgetch);
-E int FDECL(mac_nh_poskey, (int *, int *, int *));
-E int NDECL(mac_doprev_message);
-E char FDECL(mac_yn_function, (const char *, const char *, CHAR_P));
-E void FDECL(mac_getlin, (const char *, char *));
-E int NDECL(mac_get_ext_cmd);
-E void FDECL(mac_number_pad, (int));
-E void NDECL(mac_delay_output);
+E int mac_nhgetch(void);
+E int mac_nh_poskey(int *, int *, int *);
+E int mac_doprev_message(void);
+E char mac_yn_function(const char *, const char *, CHAR_P);
+E void mac_getlin(const char *, char *);
+E int mac_get_ext_cmd(void);
+E void mac_number_pad(int);
+E void mac_delay_output(void);
 
 #undef E
 
diff --git a/outdated/include/tosconf.h b/outdated/include/tosconf.h
index 90af7e98c..0d436a4b8 100644
--- a/outdated/include/tosconf.h
+++ b/outdated/include/tosconf.h
@@ -55,8 +55,8 @@
  */
 #define STRNCMPI
 #undef strcmpi
-extern int FDECL(strcmpi, (const char *, const char *));
-extern int FDECL(strncmpi, (const char *, const char *, size_t));
+extern int strcmpi(const char *, const char *);
+extern int strncmpi(const char *, const char *, size_t);
 #endif
 
 #include <termcap.h>
diff --git a/outdated/include/wceconf.h b/outdated/include/wceconf.h
index dcc7b6f95..043aa4849 100644
--- a/outdated/include/wceconf.h
+++ b/outdated/include/wceconf.h
@@ -178,10 +178,10 @@ extern char hackdir[];
 #define ABORT C('a')
 #define getuid() 1
 #define getlogin() ((char *) 0)
-extern void NDECL(win32_abort);
+extern void win32_abort(void);
 #ifdef WIN32CON
-extern void FDECL(nttty_preference_update, (const char *));
-extern void NDECL(toggle_mouse_support);
+extern void nttty_preference_update(const char *);
+extern void toggle_mouse_support(void);
 #endif
 
 #ifndef alloca
@@ -214,7 +214,7 @@ extern void NDECL(toggle_mouse_support);
 #define NH_A2W(a, w, cb) (strncpy((w), (a), (cb)))
 #endif
 
-extern int FDECL(set_win32_option, (const char *, const char *));
+extern int set_win32_option(const char *, const char *);
 
 /*
  * 3.4.3 addition - Stuff to help the user with some common, yet significant
diff --git a/outdated/sys/amiga/amidos.p b/outdated/sys/amiga/amidos.p
index c9fb4d508..fc479f9d1 100644
--- a/outdated/sys/amiga/amidos.p
+++ b/outdated/sys/amiga/amidos.p
@@ -3,40 +3,40 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 /* amidos.c */
-void NDECL(flushout );
+void flushout (void);
 #ifndef	getuid
-int NDECL(getuid );
+int getuid (void);
 #endif
 #ifndef	getpid
-int NDECL(getpid );
+int getpid (void);
 #endif
 #ifndef	getlogin
-char *NDECL(getlogin );
+char *getlogin (void);
 #endif
 #ifndef	abs
-int FDECL(abs, (int ));
-#endif
-int NDECL(tgetch );
-int NDECL(dosh );
-long FDECL(freediskspace, (char *));
-long FDECL(filesize, (char *));
-void FDECL(eraseall, (const char * , const char *));
-char *FDECL(CopyFile, (const char * , const char *));
-void FDECL(copybones, (int ));
-void NDECL(playwoRAMdisk );
-int FDECL(saveDiskPrompt, (int ));
-void NDECL(gameDiskPrompt );
-void FDECL(append_slash, (char *));
-void FDECL(getreturn, (const char *));
+int abs(int );
+#endif
+int tgetch (void);
+int dosh (void);
+long freediskspace(char *);
+long filesize(char *);
+void eraseall(const char * , const char *);
+char *CopyFile(const char * , const char *);
+void copybones(int );
+void playwoRAMdisk (void);
+int saveDiskPrompt(int );
+void gameDiskPrompt (void);
+void append_slash(char *);
+void getreturn(const char *);
 #ifndef msmsg
-void FDECL(msmsg, ( const char *, ... ));
+void msmsg( const char *, ... );
 #endif
 #if !defined(__SASC_60) && !defined(_DCC)
-int FDECL(chdir, (char *));
+int chdir(char *);
 #endif
 #ifndef	strcmpi
-int FDECL(strcmpi, (char * , char *));
+int strcmpi(char * , char *);
 #endif
 #if !defined(memcmp) && !defined(AZTEC_C) && !defined(_DCC) && !defined(__GNUC__)
-int FDECL(memcmp, (unsigned char * , unsigned char * , int ));
+int memcmp(unsigned char * , unsigned char * , int );
 #endif
diff --git a/outdated/sys/amiga/amitty.c b/outdated/sys/amiga/amitty.c
index 047a122c1..e3ff882ef 100644
--- a/outdated/sys/amiga/amitty.c
+++ b/outdated/sys/amiga/amitty.c
@@ -20,8 +20,8 @@
 #include <clib/dos_protos.h>
 #endif
 
-void NDECL(tty_change_color);
-char *NDECL(tty_get_color_string);
+void tty_change_color(void);
+char *tty_get_color_string(void);
 
 #ifdef TTY_GRAPHICS
 
diff --git a/outdated/sys/amiga/amiwind.c b/outdated/sys/amiga/amiwind.c
index 456b727c9..6a64667eb 100644
--- a/outdated/sys/amiga/amiwind.c
+++ b/outdated/sys/amiga/amiwind.c
@@ -19,7 +19,7 @@
 #ifdef AMII_GRAPHICS /* too early in the file? too late? */
 
 #ifdef AMIFLUSH
-static struct Message *FDECL(GetFMsg, (struct MsgPort *));
+static struct Message *GetFMsg(struct MsgPort *);
 #endif
 
 static int BufferGetchar(void);
@@ -126,7 +126,7 @@ struct NewWindow *nw;
  * Close a window that shared the HackPort IDCMP port.
  */
 
-void FDECL(CloseShWindow, (struct Window *));
+void CloseShWindow(struct Window *);
 void
 CloseShWindow(win)
 struct Window *win;
diff --git a/outdated/sys/amiga/amiwind.p b/outdated/sys/amiga/amiwind.p
index 3c9460b17..762646dc2 100644
--- a/outdated/sys/amiga/amiwind.p
+++ b/outdated/sys/amiga/amiwind.p
@@ -4,37 +4,37 @@
 
 /* amiwind.c */
 #ifdef	INTUI_NEW_LOOK
-struct Window *FDECL( OpenShWindow, (struct ExtNewWindow *) );
+struct Window * OpenShWindow(struct ExtNewWindow *) ;
 #else
-struct Window *FDECL( OpenShWindow, (struct NewWindow *) );
+struct Window * OpenShWindow(struct NewWindow *) ;
 #endif
-void FDECL( CloseShWindow, (struct Window *));
-int NDECL( kbhit );
-int NDECL( amikbhit );
-int NDECL( WindowGetchar );
-WETYPE NDECL( WindowGetevent );
-void NDECL( WindowFlush );
-void FDECL( WindowPutchar, (char ));
-void FDECL( WindowFPuts, (const char *));
-void FDECL( WindowPuts, (const char *));
-void FDECL( WindowPrintf, ( char *,... ));
-void NDECL( CleanUp );
-int FDECL( ConvertKey, ( struct IntuiMessage * ));
+void  CloseShWindow(struct Window *);
+int  kbhit (void);
+int  amikbhit (void);
+int  WindowGetchar (void);
+WETYPE  WindowGetevent (void);
+void  WindowFlush (void);
+void  WindowPutchar(char );
+void  WindowFPuts(const char *);
+void  WindowPuts(const char *);
+void  WindowPrintf( char *,... );
+void  CleanUp (void);
+int  ConvertKey( struct IntuiMessage * );
 #ifndef	SHAREDLIB
-void FDECL( Abort, (long ));
+void  Abort(long );
 #endif
-void FDECL( flush_glyph_buffer, (struct Window *));
-void FDECL( amiga_print_glyph, (winid , int , int ));
-void FDECL( start_glyphout, (winid ));
-void FDECL( amii_end_glyphout, (winid ));
+void  flush_glyph_buffer(struct Window *);
+void  amiga_print_glyph(winid , int , int );
+void  start_glyphout(winid );
+void  amii_end_glyphout(winid );
 #ifdef	INTUI_NEW_LOOK
-struct ExtNewWindow *FDECL( DupNewWindow, (struct ExtNewWindow *));
-void FDECL( FreeNewWindow, (struct ExtNewWindow *));
+struct ExtNewWindow * DupNewWindow(struct ExtNewWindow *);
+void  FreeNewWindow(struct ExtNewWindow *);
 #else
-struct NewWindow *FDECL( DupNewWindow, (struct NewWindow *));
-void FDECL( FreeNewWindow, (struct NewWindow *));
+struct NewWindow * DupNewWindow(struct NewWindow *);
+void  FreeNewWindow(struct NewWindow *);
 #endif
-void NDECL( bell );
-void NDECL( amii_delay_output );
-void FDECL( amii_number_pad, (int ));
+void  bell (void);
+void  amii_delay_output (void);
+void  amii_number_pad(int );
 void amii_cleanup( void );
diff --git a/outdated/sys/amiga/winami.c b/outdated/sys/amiga/winami.c
index 3e743fb38..fd295778b 100644
--- a/outdated/sys/amiga/winami.c
+++ b/outdated/sys/amiga/winami.c
@@ -21,7 +21,7 @@
 
 #ifdef AMIGA_INTUITION
 
-static int FDECL(put_ext_cmd, (char *, int, struct amii_WinDesc *, int));
+static int put_ext_cmd(char *, int, struct amii_WinDesc *, int);
 
 struct amii_DisplayDesc *amiIDisplay; /* the Amiga Intuition descriptor */
 struct Rectangle lastinvent, lastmsg;
diff --git a/outdated/sys/amiga/winami.p b/outdated/sys/amiga/winami.p
index be07f8865..0fd69a38f 100644
--- a/outdated/sys/amiga/winami.p
+++ b/outdated/sys/amiga/winami.p
@@ -2,56 +2,56 @@
 /*    Copyright (c) Gregg Wonderly, Naperville, IL, 1992, 1993	 */
 /* NetHack may be freely redistributed. See license for details. */
 /* winami.c */
-void FDECL(amii_raw_print, (const char *));
-void FDECL(amii_raw_print_bold, (const char *));
-void FDECL(amii_start_menu, (winid , unsigned long ));
-void FDECL(amii_add_menu, (winid  , char  , int  , const char *, unsigned int));
-void FDECL(amii_end_menu, (winid  , char  , const char * , const char *));
-char FDECL(amii_select_menu, (winid ));
-void NDECL(amii_update_inventory );
-void NDECL(amii_mark_synch );
-void NDECL(amii_wait_synch );
-void NDECL(amii_setclipped );
-void FDECL(amii_cliparound, (int  , int ));
-void NDECL(amii_askname );
-void NDECL(amii_player_selection );
-void NDECL(flush_output );
-void FDECL(amii_destroy_nhwindow, (winid ));
-int FDECL(amii_create_nhwindow, (int ));
-void NDECL(amii_init_nhwindows );
-int NDECL(amii_get_ext_cmd);
-char FDECL(amii_yn_function, (const char * , const char * , char ));
-void FDECL(amii_addtopl, (const char *));
-void FDECL(TextSpaces, (struct RastPort * , int ));
-void FDECL(amii_putstr, (winid  , int  , const char *));
-void FDECL(amii_putsym, (winid  , int  , int  , CHAR_P ));
-void FDECL(amii_clear_nhwindow, (winid ));
-void FDECL(amii_exit_nhwindows, (const char *));
-int FDECL(amii_nh_poskey, (int * , int * , int *));
-int NDECL(amii_nhgetch );
-void NDECL(amii_get_nh_event );
-void NDECL(amii_remember_topl );
-int NDECL(amii_doprev_message );
-void FDECL(amii_display_nhwindow, (winid  , boolean ));
-void FDECL(amii_display_file, (const char * , boolean ));
-void FDECL(amii_curs, (winid  , int  , int ));
-void FDECL(amii_print_glyph, (winid  , xchar  , xchar  , int, int ));
-void FDECL(DoMenuScroll, (int  , int ));
-void FDECL(DisplayData, (int  , int  , int ));
-void FDECL(SetPropInfo, (struct Window * , struct Gadget * , long  , long  , long ));
-void FDECL(kill_nhwindows, (int ));
-void FDECL(amii_cl_end, (struct amii_WinDesc * , int ));
-void FDECL(cursor_off, (winid ));
-void FDECL(cursor_on, (winid ));
-void NDECL(amii_getret );
-void FDECL(amii_getlin, (const char * , char *));
-void FDECL(getlind, (const char * , char * , const char *));
-void FDECL(amii_suspend_nhwindows, (char * ));
-void NDECL(amii_resume_nhwindows);
-void NDECL(amii_bell);
-void NDECL(EditColor);
-void FDECL(DrawCol, ( struct Window *, int, UWORD * ) );
-void FDECL( DispCol, ( struct Window *w, int idx, UWORD * ) );
-void FDECL( SetBorder, (struct Gadget *) );
-void NDECL( port_help );
-void FDECL( dismiss_nhwindow, (winid) );
+void amii_raw_print(const char *);
+void amii_raw_print_bold(const char *);
+void amii_start_menu(winid , unsigned long );
+void amii_add_menu(winid  , char  , int  , const char *, unsigned int);
+void amii_end_menu(winid  , char  , const char * , const char *);
+char amii_select_menu(winid );
+void amii_update_inventory (void);
+void amii_mark_synch (void);
+void amii_wait_synch (void);
+void amii_setclipped (void);
+void amii_cliparound(int  , int );
+void amii_askname (void);
+void amii_player_selection (void);
+void flush_output (void);
+void amii_destroy_nhwindow(winid );
+int amii_create_nhwindow(int );
+void amii_init_nhwindows (void);
+int amii_get_ext_cmd(void);
+char amii_yn_function(const char * , const char * , char );
+void amii_addtopl(const char *);
+void TextSpaces(struct RastPort * , int );
+void amii_putstr(winid  , int  , const char *);
+void amii_putsym(winid  , int  , int  , CHAR_P );
+void amii_clear_nhwindow(winid );
+void amii_exit_nhwindows(const char *);
+int amii_nh_poskey(int * , int * , int *);
+int amii_nhgetch (void);
+void amii_get_nh_event (void);
+void amii_remember_topl (void);
+int amii_doprev_message (void);
+void amii_display_nhwindow(winid  , boolean );
+void amii_display_file(const char * , boolean );
+void amii_curs(winid  , int  , int );
+void amii_print_glyph(winid  , xchar  , xchar  , int, int );
+void DoMenuScroll(int  , int );
+void DisplayData(int  , int  , int );
+void SetPropInfo(struct Window * , struct Gadget * , long  , long  , long );
+void kill_nhwindows(int );
+void amii_cl_end(struct amii_WinDesc * , int );
+void cursor_off(winid );
+void cursor_on(winid );
+void amii_getret (void);
+void amii_getlin(const char * , char *);
+void getlind(const char * , char * , const char *);
+void amii_suspend_nhwindows(char * );
+void amii_resume_nhwindows(void);
+void amii_bell(void);
+void EditColor(void);
+void DrawCol( struct Window *, int, UWORD * ) ;
+void  DispCol( struct Window *w, int idx, UWORD * ) ;
+void  SetBorder(struct Gadget *) ;
+void  port_help (void);
+void  dismiss_nhwindow(winid) ;
diff --git a/outdated/sys/amiga/winproto.h b/outdated/sys/amiga/winproto.h
index 5fb1441c7..eb2b588d8 100644
--- a/outdated/sys/amiga/winproto.h
+++ b/outdated/sys/amiga/winproto.h
@@ -40,10 +40,10 @@ void amii_getret(void);
 
 /* winmenu.c */
 void amii_start_menu(winid window, unsigned long);
-void FDECL(amii_add_menu, (winid, int, const anything *, CHAR_P, CHAR_P, int,
-                           const char *, unsigned int));
-void FDECL(amii_end_menu, (winid, const char *));
-int FDECL(amii_select_menu, (winid, int, menu_item **));
+void amii_add_menu(winid, int, const anything *, CHAR_P, CHAR_P, int,
+                   const char *, unsigned int);
+void amii_end_menu(winid, const char *);
+int amii_select_menu(winid, int, menu_item **);
 int DoMenuScroll(int win, int blocking, int how, menu_item **);
 void ReDisplayData(winid win);
 void DisplayData(winid win, int start);
@@ -142,7 +142,7 @@ void Abort(long rc);
 #endif
 
 /* amirip.c */
-void FDECL(amii_outrip, (winid tmpwin, int how, time_t when));
+void amii_outrip(winid tmpwin, int how, time_t when);
 
 /* winchar.c */
 void SetMazeType(MazeType);
diff --git a/outdated/sys/atari/tos.c b/outdated/sys/atari/tos.c
index 9bf36a81b..3c32891ca 100644
--- a/outdated/sys/atari/tos.c
+++ b/outdated/sys/atari/tos.c
@@ -24,9 +24,9 @@ static char *nh_HE = "\033q";
 
 #include <ctype.h>
 
-static char NDECL(DOSgetch);
-static char NDECL(BIOSgetch);
-static void NDECL(init_aline);
+static char DOSgetch(void);
+static char BIOSgetch(void);
+static void init_aline(void);
 char *_a_line; /* for Line A variables */
 #ifdef TEXTCOLOR
 boolean colors_changed = FALSE;
diff --git a/outdated/sys/mac/macfile.c b/outdated/sys/mac/macfile.c
index 49794f1cd..9c8b953ef 100644
--- a/outdated/sys/mac/macfile.c
+++ b/outdated/sys/mac/macfile.c
@@ -41,11 +41,11 @@ typedef struct handlefile {
     Handle data; /* The resource, purgeable */
 } HandleFile;
 
-static HandleFile *FDECL(IsHandleFile, (int));
-static int FDECL(OpenHandleFile, (const unsigned char *, long));
-static int FDECL(CloseHandleFile, (int));
-static int FDECL(ReadHandleFile, (int, void *, unsigned));
-static long FDECL(SetHandleFilePos, (int, short, long));
+static HandleFile *IsHandleFile(int);
+static int OpenHandleFile(const unsigned char *, long);
+static int CloseHandleFile(int);
+static int ReadHandleFile(int, void *, unsigned);
+static long SetHandleFilePos(int, short, long);
 
 HandleFile theHandleFiles[MAX_HF];
 MacDirs theDirs; /* also referenced in macwin.c */
diff --git a/outdated/sys/mac/macwin.c b/outdated/sys/mac/macwin.c
index 291d81f70..2b6f5e624 100644
--- a/outdated/sys/mac/macwin.c
+++ b/outdated/sys/mac/macwin.c
@@ -79,22 +79,22 @@ static pascal OSStatus GlobalEvent(EventHandlerCallRef, EventRef, void *);
 
 #else
 
-static void FDECL(GeneralKey, (EventRecord *, WindowPtr));
-static void FDECL(macKeyMenu, (EventRecord *, WindowPtr));
-static void FDECL(macKeyText, (EventRecord *, WindowPtr));
-
-static void FDECL(macClickMessage, (EventRecord *, WindowPtr));
-static void FDECL(macClickTerm, (EventRecord *, WindowPtr));
-static void FDECL(macClickMenu, (EventRecord *, WindowPtr));
-static void FDECL(macClickText, (EventRecord *, WindowPtr));
-
-static short FDECL(macDoNull, (EventRecord *, WindowPtr));
-static short FDECL(macUpdateMessage, (EventRecord *, WindowPtr));
-static short FDECL(macUpdateMenu, (EventRecord *, WindowPtr));
-static short FDECL(GeneralUpdate, (EventRecord *, WindowPtr));
-
-static void FDECL(macCursorTerm, (EventRecord *, WindowPtr, RgnHandle));
-static void FDECL(GeneralCursor, (EventRecord *, WindowPtr, RgnHandle));
+static void GeneralKey(EventRecord *, WindowPtr);
+static void macKeyMenu(EventRecord *, WindowPtr);
+static void macKeyText(EventRecord *, WindowPtr);
+
+static void macClickMessage(EventRecord *, WindowPtr);
+static void macClickTerm(EventRecord *, WindowPtr);
+static void macClickMenu(EventRecord *, WindowPtr);
+static void macClickText(EventRecord *, WindowPtr);
+
+static short macDoNull(EventRecord *, WindowPtr);
+static short macUpdateMessage(EventRecord *, WindowPtr);
+static short macUpdateMenu(EventRecord *, WindowPtr);
+static short GeneralUpdate(EventRecord *, WindowPtr);
+
+static void macCursorTerm(EventRecord *, WindowPtr, RgnHandle);
+static void GeneralCursor(EventRecord *, WindowPtr, RgnHandle);
 #endif
 
 static void TextUpdate(NhWindow *wind);
@@ -215,12 +215,12 @@ Boolean small_screen = 0;
 #endif
 #define NHW_BASE 0
 
-static int FDECL(filter_scroll_key, (const int, NhWindow *));
+static int filter_scroll_key(const int, NhWindow *);
 
 #if 1 //!TARGET_API_MAC_CARBON
-static void FDECL(DoScrollBar, (Point, short, ControlHandle, NhWindow *));
+static void DoScrollBar(Point, short, ControlHandle, NhWindow *);
 #endif
-static pascal void FDECL(MoveScrollBar, (ControlHandle, short));
+static pascal void MoveScrollBar(ControlHandle, short);
 
 #if 1 //!TARGET_API_MAC_CARBON
 typedef void (*CbFunc)(EventRecord *, WindowPtr);
diff --git a/outdated/sys/mac/mgetline.c b/outdated/sys/mac/mgetline.c
index 7b3e91ba7..6729916a7 100644
--- a/outdated/sys/mac/mgetline.c
+++ b/outdated/sys/mac/mgetline.c
@@ -9,9 +9,9 @@
 #include "macpopup.h"
 #include "func_tab.h"
 
-extern int NDECL(extcmd_via_menu); /* cmd.c */
+extern int extcmd_via_menu(void); /* cmd.c */
 
-typedef Boolean FDECL((*key_func), (unsigned char));
+typedef Boolean (*key_func)(unsigned char);
 
 int
 get_line_from_key_queue(char *bufp)
diff --git a/outdated/sys/msdos/ovlinit.c b/outdated/sys/msdos/ovlinit.c
index bc18134ad..152f21f73 100644
--- a/outdated/sys/msdos/ovlinit.c
+++ b/outdated/sys/msdos/ovlinit.c
@@ -66,7 +66,7 @@ signed long tmpbuffer;
 int emsstatus;
 int xmsstatus;
 
-void NDECL(_resizeOvrBuffer);
+void _resizeOvrBuffer(void);
 
 void
 _resizeOvrBuffer()
diff --git a/outdated/sys/os2/os2.c b/outdated/sys/os2/os2.c
index 83798968e..10a3a38db 100644
--- a/outdated/sys/os2/os2.c
+++ b/outdated/sys/os2/os2.c
@@ -30,8 +30,8 @@
 
 #include <ctype.h>
 
-static char NDECL(DOSgetch);
-static char NDECL(BIOSgetch);
+static char DOSgetch(void);
+static char BIOSgetch(void);
 
 int
 tgetch()
diff --git a/outdated/sys/wince/winhack.c b/outdated/sys/wince/winhack.c
index 264643663..9c6414cec 100644
--- a/outdated/sys/wince/winhack.c
+++ b/outdated/sys/wince/winhack.c
@@ -11,7 +11,7 @@
 
 extern char orgdir[PATHLEN]; /* also used in pcsys.c, amidos.c */
 
-extern void FDECL(nethack_exit, (int));
+extern void nethack_exit(int);
 static TCHAR *_get_cmd_arg(TCHAR *pCmdLine);
 
 // Global Variables:
@@ -24,7 +24,7 @@ static void win_hack_init(int, char **);
 static void __cdecl mswin_moveloop(void *);
 static BOOL setMapTiles(const char *fname);
 
-extern boolean FDECL(pcmain, (int, char **));
+extern boolean pcmain(int, char **);
 
 #define MAX_CMDLINE_PARAM 255
 
diff --git a/outdated/sys/wince/winmain.c b/outdated/sys/wince/winmain.c
index 7007166e3..2c0ec5e48 100644
--- a/outdated/sys/wince/winmain.c
+++ b/outdated/sys/wince/winmain.c
@@ -7,7 +7,7 @@
 
 #define MAX_CMDLINE_PARAM 255
 
-extern int FDECL(main, (int, char **));
+extern int main(int, char **);
 static TCHAR *_get_cmd_arg(TCHAR *pCmdLine);
 
 int APIENTRY
diff --git a/outdated/win/Qt3/tileedit.cpp b/outdated/win/Qt3/tileedit.cpp
index cbde51867..f6f89e452 100644
--- a/outdated/win/Qt3/tileedit.cpp
+++ b/outdated/win/Qt3/tileedit.cpp
@@ -26,7 +26,7 @@ tileedit: tileedit.cpp $(TEXT_IO)
 extern "C" {
 #include "config.h"
 #include "tile.h"
-extern const char *FDECL(tilename, (int, int));
+extern const char *tilename(int, int);
 }
 
 #define TILES_ACROSS 20
diff --git a/outdated/win/gem/tile2img.c b/outdated/win/gem/tile2img.c
index 765b4a7c1..11ce9820d 100644
--- a/outdated/win/gem/tile2img.c
+++ b/outdated/win/gem/tile2img.c
@@ -18,8 +18,8 @@
 /* #define COLORS_IN_USE MAXCOLORMAPSIZE       /* 256 colors */
 #define COLORS_IN_USE 16 /* 16 colors */
 
-extern char *FDECL(tilename, (int, int));
-static void FDECL(build_ximgtile, (pixel(*) [TILE_X]));
+extern char *tilename(int, int);
+static void build_ximgtile(pixel(*) [TILE_X]);
 void get_color(unsigned int colind, struct RGB *rgb);
 void get_pixel(int x, int y, unsigned int *colind);
 
diff --git a/outdated/win/gem/wingem.c b/outdated/win/gem/wingem.c
index 0e32efc7f..0c3e055f2 100644
--- a/outdated/win/gem/wingem.c
+++ b/outdated/win/gem/wingem.c
@@ -18,8 +18,8 @@
 static char nullstr[] = "", winpanicstr[] = "Bad window id %d";
 static int curr_status_line;
 
-static char *FDECL(copy_of, (const char *));
-static void FDECL(bail, (const char *)); /* __attribute__((noreturn)) */
+static char *copy_of(const char *);
+static void bail(const char *); /* __attribute__((noreturn)) */
 
 extern int mar_set_tile_mode(int);
 extern void mar_set_font(int, const char *, int);