1 files changed, 59 insertions, 78 deletions

diff --git a/protos.h b/protos.h
index 850fb449..26d520cc 100644
--- a/protos.h
+++ b/protos.h
@@ -23,105 +23,86 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifdef __STDC__
 #define aptr_t void *	/* arbitrary pointer type */
-#else
-#define aptr_t char *
-#endif
-extern aptr_t malloc P((MALLOC_ARG_T));
-extern aptr_t realloc P((aptr_t, MALLOC_ARG_T));
-extern aptr_t calloc P((MALLOC_ARG_T, MALLOC_ARG_T));
+extern aptr_t malloc(MALLOC_ARG_T);
+extern aptr_t realloc(aptr_t, MALLOC_ARG_T);
+extern aptr_t calloc(MALLOC_ARG_T, MALLOC_ARG_T);
 
-extern void free P((aptr_t));
-extern char *getenv P((const char *));
+extern void free(aptr_t);
+extern char *getenv(const char *);
 
 #if ! defined(HAVE_STRING_H) && ! defined(HAVE_STRINGS_H)
-extern char *strcpy P((char *, const char *));
-extern char *strcat P((char *, const char *));
-extern char *strncpy P((char *, const char *, size_t));
-extern int strcmp P((const char *, const char *));
-extern int strncmp P((const char *, const char *, size_t));
-extern char *strchr P((const char *, int));
-extern char *strrchr P((const char *, int));
-extern char *strstr P((const char *s1, const char *s2));
-extern size_t strlen P((const char *));
-extern long strtol P((const char *, char **, int));
+extern char *strcpy(char *, const char *);
+extern char *strcat(char *, const char *);
+extern char *strncpy(char *, const char *, size_t);
+extern int strcmp(const char *, const char *);
+extern int strncmp(const char *, const char *, size_t);
+extern char *strchr(const char *, int);
+extern char *strrchr(const char *, int);
+extern char *strstr(const char *s1, const char *s2);
+extern size_t strlen(const char *);
+extern long strtol(const char *, char **, int);
 
-extern aptr_t memset P((aptr_t, int, size_t));
-extern aptr_t memcpy P((aptr_t, const aptr_t, size_t));
-extern aptr_t memmove P((aptr_t, const aptr_t, size_t));
-extern aptr_t memchr P((const aptr_t, int, size_t));
-extern int memcmp P((const aptr_t, const aptr_t, size_t));
+extern aptr_t memset(aptr_t, int, size_t);
+extern aptr_t memcpy(aptr_t, const aptr_t, size_t);
+extern aptr_t memmove(aptr_t, const aptr_t, size_t);
+extern aptr_t memchr(const aptr_t, int, size_t);
+extern int memcmp(const aptr_t, const aptr_t, size_t);
 #endif /* ! defined(HAVE_STRING_H) && ! defined(HAVE_STRINGS_H) */
 
 #ifndef VMS
-extern char *strerror P((int));
+extern char *strerror(int);
 #else
-extern char *strerror P((int,...));
+extern char *strerror(int,...);
 #endif
 
-#if ! defined(_MSC_VER) && ! defined(__GNU_LIBRARY__)
-extern size_t strftime P((char *, size_t, const char *, const struct tm *));
-#endif
-#ifdef __STDC__
-extern time_t time P((time_t *));
-#else
-extern long time();
+#if ! defined(__GNU_LIBRARY__)
+extern size_t strftime(char *, size_t, const char *, const struct tm *);
 #endif
+extern time_t time(time_t *);
 
-extern FILE *fdopen P((int, const char *));
-extern int fprintf P((FILE *, const char *, ...)); 
-#if ! defined(MSDOS) && ! defined(__GNU_LIBRARY__)
-#ifdef __STDC__
-extern size_t fwrite P((const aptr_t, size_t, size_t, FILE *));
-#else
-extern int fwrite();
+extern FILE *fdopen(int, const char *);
+extern int fprintf(FILE *, const char *, ...); 
+#if ! defined(__GNU_LIBRARY__)
+extern size_t fwrite(const aptr_t, size_t, size_t, FILE *);
 #endif
-extern int fputs P((const char *, FILE *));
-extern int unlink P((const char *));
-#endif
-extern int fflush P((FILE *));
-extern int fclose P((FILE *));
-extern FILE *popen P((const char *, const char *));
-extern int pclose P((FILE *));
-extern void abort P(());
-extern int isatty P((int));
-extern void exit P((int));
-extern int system P((const char *));
-extern int sscanf P((const char *, const char *, ...));
+extern int fputs(const char *, FILE *);
+extern int unlink(const char *);
+extern int fflush(FILE *);
+extern int fclose(FILE *);
+extern FILE *popen(const char *, const char *);
+extern int pclose(FILE *);
+extern void abort();
+extern int isatty(int);
+extern void exit(int);
+extern int system(const char *);
+extern int sscanf(const char *, const char *, ...);
 #ifndef toupper
-extern int toupper P((int));
+extern int toupper(int);
 #endif
 #ifndef tolower
-extern int tolower P((int));
+extern int tolower(int);
 #endif
 
-extern double pow P((double x, double y));
-extern double atof P((const char *));
-extern double strtod P((const char *, char **));
-extern int fstat P((int, struct stat *));
-extern int stat P((const char *, struct stat *));
-extern off_t lseek P((int, off_t, int));
-extern int close P((int));
-extern int creat P((const char *, mode_t));
-extern int open P((const char *, int, ...));
-extern int pipe P((int *));
-extern int dup P((int));
-extern int dup2 P((int,int));
-extern int fork P(());
-extern int execl P((const char *, const char *, ...));
-#ifndef __STDC__
-extern int read P((int, void *, unsigned int));
-#endif
+extern double pow(double x, double y);
+extern double atof(const char *);
+extern double strtod(const char *, char **);
+extern int fstat(int, struct stat *);
+extern int stat(const char *, struct stat *);
+extern off_t lseek(int, off_t, int);
+extern int close(int);
+extern int creat(const char *, mode_t);
+extern int open(const char *, int, ...);
+extern int pipe(int *);
+extern int dup(int);
+extern int dup2(int,int);
+extern int fork();
+extern int execl(const char *, const char *, ...);
 #ifndef HAVE_SYS_WAIT_H
-extern int wait P((int *));
-#endif
-extern void _exit P((int));
-
-#ifndef __STDC__
-extern long time P((long *));
+extern int wait(int *);
 #endif
+extern void _exit(int);
 
-extern SPRINTF_RET sprintf P((char *, const char *, ...));
+extern SPRINTF_RET sprintf(char *, const char *, ...);
 
 #undef aptr_t