From: nhmall <nhmall@nethack.org>
Date: Thu, 28 Jan 2021 12:55:34 +0000 (-0500)
Subject: remove more FDECL, NDECL macro usage
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f625a8c553778d4ec79a0a21750a913468a8116a;p=nethack

remove more FDECL, NDECL macro usage
---

diff --git a/include/system.h b/include/system.h
index dd53307de..630078ecf 100644
--- a/include/system.h
+++ b/include/system.h
@@ -80,20 +80,20 @@ typedef long off_t;
 #undef random
 #endif
 #if !defined(__SC__) && !defined(LINUX)
-E long NDECL(random);
+E long random(void);
 #endif
 #if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) \
     || defined(RANDOM)
-E void FDECL(srandom, (unsigned int));
+E void srandom(unsigned int);
 #else
 #if !defined(bsdi) && !defined(__FreeBSD__)
-E int FDECL(srandom, (unsigned int));
+E int srandom(unsigned int);
 #endif
 #endif
 #else
 #if defined(MACOSX)
-E long NDECL(lrand48);
-E void FDECL(srand48, (long));
+E long lrand48(void);
+E void srand48(long);
 #else
 extern long lrand48(void);
 extern void srand48(long);
@@ -103,7 +103,7 @@ extern void srand48(long);
 #if !defined(BSD) || defined(ultrix)
 /* real BSD wants all these to return int */
 #ifndef MICRO
-E void FDECL(exit, (int));
+E void exit(int);
 #endif /* MICRO */
 /* compensate for some CSet/2 bogosities */
 #if defined(OS2_CSET2) && defined(OS2_CSET2_VER_2)
@@ -122,31 +122,31 @@ E void FDECL(exit, (int));
 #if defined(__STDC__) || !defined(FLEX_SCANNER)
 #ifndef OS2_CSET2
 #ifndef MONITOR_HEAP
-E void FDECL(free, (genericptr_t));
+E void free(genericptr_t);
 #endif
 #endif
 #endif
 #if !defined(__SASC_60) && !defined(_DCC) && !defined(__SC__)
 #if defined(AMIGA) && !defined(AZTEC_50) && !defined(__GNUC__)
-E int FDECL(perror, (const char *));
+E int perror(const char *);
 #else
 #if !(defined(ULTRIX_PROTO) && defined(__GNUC__))
-E void FDECL(perror, (const char *));
+E void perror(const char *);
 #endif
 #endif
 #endif
 #endif
 #ifndef NeXT
 #ifdef POSIX_TYPES
-E void FDECL(qsort, (genericptr_t, size_t, size_t,
-                     int (*)(const genericptr, const genericptr)));
+E void qsort(genericptr_t, size_t, size_t,
+             int (*)(const genericptr, const genericptr));
 #else
 #if defined(BSD) || defined(ULTRIX)
 E int qsort();
 #else
 #if !defined(LATTICE) && !defined(AZTEC_50)
-E void FDECL(qsort, (genericptr_t, size_t, size_t,
-                     int (*)(const genericptr, const genericptr)));
+E void qsort(genericptr_t, size_t, size_t,
+             int (*)(const genericptr, const genericptr));
 #endif
 #endif
 #endif
@@ -158,21 +158,21 @@ E void FDECL(qsort, (genericptr_t, size_t, size_t,
 
 #ifdef ULTRIX
 #ifdef ULTRIX_PROTO
-E int FDECL(lseek, (int, off_t, int));
+E int lseek(int, off_t, int);
 #else
-E long FDECL(lseek, (int, off_t, int));
+E long lseek(int, off_t, int);
 #endif
 /* Ultrix 3.0 man page mistakenly says it returns an int. */
-E int FDECL(write, (int, char *, int));
-E int FDECL(link, (const char *, const char *));
+E int write(int, char *, int);
+E int link(const char *, const char *);
 #else /*!ULTRIX*/
 #if !(defined(bsdi) || defined(VMS))
-E long FDECL(lseek, (int, long, int));
+E long lseek(int, long, int);
 #if defined(POSIX_TYPES) || defined(__TURBOC__)
-E int FDECL(write, (int, const void *, unsigned));
+E int write(int, const void *, unsigned);
 #else
 #ifndef __MWERKS__ /* metrowerks defines write via universal headers */
-E int FDECL(write, (int, genericptr_t, unsigned));
+E int write(int, genericptr_t, unsigned);
 #endif
 #endif /*?(POSIX_TYPES || __TURBOC__)*/
 #endif /*!(bsdi || VMS)*/
@@ -180,13 +180,13 @@ E int FDECL(write, (int, genericptr_t, unsigned));
 
 #ifdef OS2_CSET2 /* IBM CSet/2 */
 #ifdef OS2_CSET2_VER_1
-E int FDECL(unlink, (char *));
+E int unlink(char *);
 #else
-E int FDECL(unlink, (const char *)); /* prototype is ok in ver >= 2 */
+E int unlink(const char *); /* prototype is ok in ver >= 2 */
 #endif
 #else
 #ifndef __SC__
-E int FDECL(unlink, (const char *));
+E int unlink(const char *);
 #endif
 #endif
 
@@ -194,89 +194,89 @@ E int FDECL(unlink, (const char *));
 
 #ifdef MAC
 #ifndef __CONDITIONALMACROS__          /* universal headers */
-E int FDECL(close, (int));             /* unistd.h */
-E int FDECL(read, (int, char *, int)); /* unistd.h */
-E int FDECL(chdir, (const char *));    /* unistd.h */
-E char *FDECL(getcwd, (char *, int));  /* unistd.h */
+E int close(int);             /* unistd.h */
+E int read(int, char *, int); /* unistd.h */
+E int chdir(const char *);    /* unistd.h */
+E char *getcwd(char *, int);  /* unistd.h */
 #endif
 
-E int FDECL(open, (const char *, int));
+E int open(const char *, int);
 #endif
 
 #if defined(MICRO)
-E int FDECL(close, (int));
+E int close(int);
 #ifndef __EMX__
-E int FDECL(read, (int, genericptr_t, unsigned int));
+E int read(int, genericptr_t, unsigned int);
 #endif
-E int FDECL(open, (const char *, int, ...));
-E int FDECL(dup2, (int, int));
-E int FDECL(setmode, (int, int));
-E int NDECL(kbhit);
+E int open(const char *, int, ...);
+E int dup2(int, int);
+E int setmode(int, int);
+E int kbhit(void);
 #if !defined(_DCC)
 #if defined(__TURBOC__)
-E int FDECL(chdir, (const char *));
+E int chdir(const char *);
 #else
 #ifndef __EMX__
-E int FDECL(chdir, (char *));
+E int chdir(char *);
 #endif
 #endif
 #ifndef __EMX__
-E char *FDECL(getcwd, (char *, int));
+E char *getcwd(char *, int);
 #endif
 #endif /* !_DCC */
 #endif
 
 #ifdef ULTRIX
-E int FDECL(close, (int));
-E int FDECL(atoi, (const char *));
-E long FDECL(atol, (const char *));
-E int FDECL(chdir, (const char *));
+E int close(int);
+E int atoi(const char *);
+E long atol(const char *);
+E int chdir(const char *);
 #if !defined(ULTRIX_CC20) && !defined(__GNUC__)
-E int FDECL(chmod, (const char *, int));
-E mode_t FDECL(umask, (int));
+E int chmod(const char *, int);
+E mode_t umask(int);
 #endif
 E int FDECL(read, (int, genericptr_t, unsigned));
 /* these aren't quite right, but this saves including lots of system files */
-E int FDECL(stty, (int, genericptr_t));
-E int FDECL(gtty, (int, genericptr_t));
-E int FDECL(ioctl, (int, int, char *));
-E int FDECL(isatty, (int)); /* 1==yes, 0==no, -1==error */
+E int stty(int, genericptr_t);
+E int gtty(int, genericptr_t);
+E int ioctl(int, int, char *);
+E int isatty(int); /* 1==yes, 0==no, -1==error */
 #include <sys/file.h>
 #if defined(ULTRIX_PROTO) || defined(__GNUC__)
-E int NDECL(fork);
+E int fork(void);
 #else
-E long NDECL(fork);
+E long fork(void);
 #endif
 #endif /* ULTRIX */
 
 #ifdef VMS
 #ifndef abs
-E int FDECL(abs, (int));
+E int abs(int);
 #endif
-E int FDECL(atexit, (void (*)(void)));
-E int FDECL(atoi, (const char *));
-E long FDECL(atol, (const char *));
-E int FDECL(chdir, (const char *));
-E int FDECL(chown, (const char *, unsigned, unsigned));
+E int atexit(void (*)(void));
+E int atoi(const char *);
+E long atol(const char *);
+E int chdir(const char *);
+E int chown(const char *, unsigned, unsigned);
 #ifdef __DECC_VER
-E int FDECL(chmod, (const char *, mode_t));
-E mode_t FDECL(umask, (mode_t));
+E int chmod(const char *, mode_t);
+E mode_t umask(mode_t);
 #else
-E int FDECL(chmod, (const char *, int));
-E int FDECL(umask, (int));
+E int chmod(const char *, int);
+E int umask(int);
 #endif
 /* #include <unixio.h> */
-E int FDECL(close, (int));
-E int VDECL(creat, (const char *, unsigned, ...));
-E int FDECL(delete, (const char *));
-E int FDECL(fstat, (/*_ int, stat_t * _*/));
-E int FDECL(isatty, (int)); /* 1==yes, 0==no, -1==error */
-E off_t FDECL(lseek, (int, off_t, int));
-E int VDECL(open, (const char *, int, unsigned, ...));
-E int FDECL(read, (int, genericptr_t, unsigned));
-E int FDECL(rename, (const char *, const char *));
-E int FDECL(stat, (/*_ const char *,stat_t * _*/));
-E int FDECL(write, (int, const genericptr, unsigned));
+E int close(int);
+E int creat(const char *, unsigned, ...);
+E int delete(const char *);
+E int fstat(/*_ int, stat_t * _*/);
+E int isatty(int); /* 1==yes, 0==no, -1==error */
+E off_t lseek(int, off_t, int);
+E int open(const char *, int, unsigned, ...);
+E int read(int, genericptr_t, unsigned);
+E int rename(const char *, const char *);
+E int stat(/*_ const char *,stat_t * _*/);
+E int write(int, const genericptr, unsigned);
 #endif
 
 #endif /* __SASC_60 */
@@ -286,19 +286,19 @@ E int FDECL(write, (int, const genericptr, unsigned));
 E void abort();
 E void bcopy();
 #ifdef ULTRIX
-E int FDECL(system, (const char *));
+E int system(const char *);
 #ifndef _UNISTD_H_
-E int FDECL(execl, (const char *, ...));
+E int execl(const char *, ...);
 #endif
 #endif
 #endif
 #ifdef MICRO
-E void NDECL(abort);
-E void FDECL(_exit, (int));
-E int FDECL(system, (const char *));
+E void abort(void);
+E void _exit(int);
+E int system(const char *);
 #endif
 #if defined(HPUX) && !defined(_POSIX_SOURCE)
-E long NDECL(fork);
+E long fork(void);
 #endif
 
 #ifdef POSIX_TYPES
@@ -309,9 +309,9 @@ E long NDECL(fork);
 #if defined(NHSTDC) || (defined(VMS) && !defined(ANCIENT_VAXC))
 #if !defined(_AIX32) && !(defined(SUNOS4) && defined(__STDC__))
 /* Solaris unbundled cc (acc) */
-E int FDECL(memcmp, (const void *, const void *, size_t));
-E void *FDECL(memcpy, (void *, const void *, size_t));
-E void *FDECL(memset, (void *, int, size_t));
+E int memcmp(const void *, const void *, size_t);
+E void *memcpy(void *, const void *, size_t);
+E void *memset(void *, int, size_t);
 #endif
 #else
 #ifndef memcmp /* some systems seem to macro these back to b*() */
@@ -326,27 +326,27 @@ E char *memset();
 #endif
 #else
 #ifdef HPUX
-E int FDECL(memcmp, (char *, char *, int));
-E void *FDECL(memcpy, (char *, char *, int));
-E void *FDECL(memset, (char *, int, int));
+E int memcmp(char *, char *, int);
+E void *memcpy(char *, char *, int);
+E void *memset(char *, int, int);
 #endif
 #endif
 #endif /* POSIX_TYPES */
 
 #if defined(MICRO) && !defined(LATTICE)
 #if defined(TOS) && defined(__GNUC__)
-E int FDECL(memcmp, (const void *, const void *, size_t));
-E void *FDECL(memcpy, (void *, const void *, size_t));
-E void *FDECL(memset, (void *, int, size_t));
+E int memcmp(const void *, const void *, size_t);
+E void *memcpy(void *, const void *, size_t);
+E void *memset(void *, int, size_t);
 #else
 #if defined(AZTEC_50) || defined(NHSTDC)
-E int FDECL(memcmp, (const void *, const void *, size_t));
-E void *FDECL(memcpy, (void *, const void *, size_t));
-E void *FDECL(memset, (void *, int, size_t));
+E int memcmp(const void *, const void *, size_t);
+E void *memcpy(void *, const void *, size_t);
+E void *memset(void *, int, size_t);
 #else
-E int FDECL(memcmp, (char *, char *, unsigned int));
-E char *FDECL(memcpy, (char *, char *, unsigned int));
-E char *FDECL(memset, (char *, int, int));
+E int memcmp(char *, char *, unsigned int);
+E char *memcpy(char *, char *, unsigned int);
+E char *memset(char *, int, int);
 #endif /* AZTEC_50 || NHSTDC */
 #endif /* TOS */
 #endif /* MICRO */
@@ -358,40 +358,40 @@ E void sleep();
 extern unsigned int sleep(unsigned int);
 #endif
 #if defined(HPUX)
-E unsigned int FDECL(sleep, (unsigned int));
+E unsigned int sleep(unsigned int);
 #endif
 #ifdef VMS
-E int FDECL(sleep, (unsigned));
+E int sleep(unsigned);
 #endif
 
-E char *FDECL(getenv, (const char *));
+E char *getenv(const char *);
 extern char *getlogin(void);
 #if defined(HPUX) && !defined(_POSIX_SOURCE)
-E long NDECL(getuid);
-E long NDECL(getgid);
-E long NDECL(getpid);
+E long getuid(void);
+E long getgid(void);
+E long getpid(void);
 #else
 #ifdef POSIX_TYPES
-E pid_t NDECL(getpid);
-E uid_t NDECL(getuid);
-E gid_t NDECL(getgid);
+E pid_t getpid(void);
+E uid_t getuid(void);
+E gid_t getgid(void);
 #ifdef VMS
-E pid_t NDECL(getppid);
+E pid_t getppid(void);
 #endif
 #else          /*!POSIX_TYPES*/
 #ifndef getpid /* Borland C defines getpid() as a macro */
-E int NDECL(getpid);
+E int getpid(void);
 #endif
 #ifdef VMS
-E int NDECL(getppid);
-E unsigned NDECL(getuid);
-E unsigned NDECL(getgid);
+E int getppid(void);
+E unsigned getuid(void);
+E unsigned getgid(void);
 #endif
 #if defined(ULTRIX) && !defined(_UNISTD_H_)
-E unsigned NDECL(getuid);
-E unsigned NDECL(getgid);
-E int FDECL(setgid, (int));
-E int FDECL(setuid, (int));
+E unsigned getuid(void);
+E unsigned getgid(void);
+E int setgid(int);
+E int setuid(int);
 #endif
 #endif /*?POSIX_TYPES*/
 #endif /*?(HPUX && !_POSIX_SOURCE)*/
@@ -408,31 +408,31 @@ E int FDECL(setuid, (int));
 #if (defined(ULTRIX) || defined(NeXT)) && defined(__GNUC__)
 #include <strings.h>
 #else
-E char *FDECL(strcpy, (char *, const char *));
-E char *FDECL(strncpy, (char *, const char *, size_t));
-E char *FDECL(strcat, (char *, const char *));
-E char *FDECL(strncat, (char *, const char *, size_t));
-E char *FDECL(strpbrk, (const char *, const char *));
+E char *strcpy(char *, const char *);
+E char *strncpy(char *, const char *, size_t);
+E char *strcat(char *, const char *);
+E char *strncat(char *, const char *, size_t);
+E char *strpbrk(const char *, const char *);
 
 #if defined(SYSV) || defined(MICRO) || defined(MAC) || defined(VMS) \
     || defined(HPUX)
-E char *FDECL(strchr, (const char *, int));
-E char *FDECL(strrchr, (const char *, int));
+E char *strchr(const char *, int);
+E char *strrchr(const char *, int);
 #else /* BSD */
-E char *FDECL(index, (const char *, int));
-E char *FDECL(rindex, (const char *, int));
+E char *index(const char *, int);
+E char *rindex(const char *, int);
 #endif
 
-E int FDECL(strcmp, (const char *, const char *));
-E int FDECL(strncmp, (const char *, const char *, size_t));
+E int strcmp(const char *, const char *);
+E int strncmp(const char *, const char *, size_t);
 #if defined(MICRO) || defined(MAC) || defined(VMS)
-E size_t FDECL(strlen, (const char *));
+E size_t strlen(const char *);
 #else
 #ifdef HPUX
-E unsigned int FDECL(strlen, (char *));
+E unsigned int strlen(char *);
 #else
 #if !(defined(ULTRIX_PROTO) && defined(__GNUC__))
-E int FDECL(strlen, (const char *));
+E int strlen(const char *);
 #endif
 #endif /* HPUX */
 #endif /* MICRO */
@@ -441,8 +441,8 @@ E int FDECL(strlen, (const char *));
 #endif /* !_XtIntrinsic_h_ && !POSIX_TYPES */
 
 #if defined(ULTRIX) && defined(__GNUC__)
-E char *FDECL(index, (const char *, int));
-E char *FDECL(rindex, (const char *, int));
+E char *index(const char *, int);
+E char *rindex(const char *, int);
 #endif
 
 /* Old varieties of BSD have char *sprintf().
@@ -470,7 +470,7 @@ E char *FDECL(rindex, (const char *, int));
 
 #ifndef SPRINTF_PROTO
 #if defined(POSIX_TYPES) || defined(DGUX) || defined(NeXT) || !defined(BSD)
-E int FDECL(sprintf, (char *, const char *, ...));
+E int sprintf(char *, const char *, ...);
 #else
 #define OLD_SPRINTF
 E char *sprintf();
@@ -486,9 +486,9 @@ E char *sprintf();
 #if !defined(SVR4) && !defined(apollo)
 #if !(defined(ULTRIX_PROTO) && defined(__GNUC__))
 #if !(defined(SUNOS4) && defined(__STDC__)) /* Solaris unbundled cc (acc) */
-E int FDECL(vsprintf, (char *, const char *, va_list));
-E int FDECL(vfprintf, (FILE *, const char *, va_list));
-E int FDECL(vprintf, (const char *, va_list));
+E int vsprintf(char *, const char *, va_list);
+E int vfprintf(FILE *, const char *, va_list);
+E int vprintf(const char *, va_list);
 #endif
 #endif
 #endif
@@ -510,58 +510,58 @@ E int FDECL(vprintf, (const char *, va_list));
 #endif
 
 #ifdef MICRO
-E int FDECL(tgetent, (const char *, const char *));
-E void FDECL(tputs, (const char *, int, int (*)()));
-E int FDECL(tgetnum, (const char *));
-E int FDECL(tgetflag, (const char *));
-E char *FDECL(tgetstr, (const char *, char **));
-E char *FDECL(tgoto, (const char *, int, int));
+E int tgetent(const char *, const char *);
+E void tputs(const char *, int, int (*)(void));
+E int tgetnum(const char *);
+E int tgetflag(const char *);
+E char *tgetstr(const char *, char **);
+E char *tgoto(const char *, int, int);
 #else
 #if !(defined(HPUX) && defined(_POSIX_SOURCE))
-E int FDECL(tgetent, (char *, const char *));
+E int tgetent(char *, const char *);
 extern void tputs(const char *, int, int (*)(int));
 #endif
-E int FDECL(tgetnum, (const char *));
-E int FDECL(tgetflag, (const char *));
-E char *FDECL(tgetstr, (const char *, char **));
-E char *FDECL(tgoto, (const char *, int, int));
+E int tgetnum(const char *);
+E int tgetflag(const char *);
+E char *tgetstr(const char *, char **);
+E char *tgoto(const char *, int, int);
 #endif
 
 #if defined(ALLOC_C) || defined(MAKEDEFS_C) || defined(MDLIB_C)
-E genericptr_t FDECL(malloc, (size_t));
-E genericptr_t FDECL(realloc, (genericptr_t, size_t));
+E genericptr_t malloc(size_t);
+E genericptr_t realloc(genericptr_t, size_t);
 #endif
 
 /* time functions */
 
 #ifndef LATTICE
 #if !(defined(ULTRIX_PROTO) && defined(__GNUC__))
-E struct tm *FDECL(localtime, (const time_t *));
+E struct tm *localtime(const time_t *);
 #endif
 #endif
 
 #if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES))          \
     || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) \
     || (defined(HPUX) && defined(_POSIX_SOURCE))
-E time_t FDECL(time, (time_t *));
+E time_t time(time_t *);
 #else
-E long FDECL(time, (time_t *));
+E long time(time_t *);
 #endif /* ULTRIX */
 
 #ifdef VMS
 /* used in makedefs.c, but missing from gcc-vms's <time.h> */
-E char *FDECL(ctime, (const time_t *));
+E char *ctime(const time_t *);
 #endif
 
 #ifdef MICRO
 #ifdef abs
 #undef abs
 #endif
-E int FDECL(abs, (int));
+E int abs(int);
 #ifdef atoi
 #undef atoi
 #endif
-E int FDECL(atoi, (const char *));
+E int atoi, (const char *);
 #endif
 
 #undef E