From 903e21b4513a956bcbe2de6152b201b7fbd001f6 Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" <scrappy@hub.org> Date: Fri, 19 Dec 1997 22:47:00 +0000 Subject: [PATCH] More cleanups. Move alot of the prototype definitions straight into config.h, right beside their appropriate HAVE_ #ifdefs...one central location that is included everywhere... --- src/backend/port/hpux/port-protos.h | 5 +---- src/backend/port/i386_solaris/port-protos.h | 6 +---- src/backend/port/irix5/port-protos.h | 3 --- src/backend/port/sparc_solaris/port-protos.h | 20 +---------------- src/backend/port/svr4/port-protos.h | 4 ---- src/backend/port/ultrix4/port-protos.h | 13 +---------- .../port/univel/frontend-port-protos.h | 22 ------------------- src/backend/port/univel/port-protos.h | 6 ----- src/include/config.h.in | 21 ++++++++++++++++++ 9 files changed, 25 insertions(+), 75 deletions(-) delete mode 100644 src/backend/port/univel/frontend-port-protos.h diff --git a/src/backend/port/hpux/port-protos.h b/src/backend/port/hpux/port-protos.h index 7b4fad99fa7..dbf43ce5f1a 100644 --- a/src/backend/port/hpux/port-protos.h +++ b/src/backend/port/hpux/port-protos.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: port-protos.h,v 1.4 1997/09/08 02:26:23 momjian Exp $ + * $Id: port-protos.h,v 1.5 1997/12/19 22:45:57 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -27,8 +27,5 @@ extern int init_address_fixup(void); extern double rint(double x); extern double cbrt(double x); -extern long random(void); -extern void srandom(unsigned seed); -extern int getrusage(int who, struct rusage * ru); #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/i386_solaris/port-protos.h b/src/backend/port/i386_solaris/port-protos.h index dd5d73418a2..0739e214281 100644 --- a/src/backend/port/i386_solaris/port-protos.h +++ b/src/backend/port/i386_solaris/port-protos.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: port-protos.h,v 1.3 1997/09/08 02:26:27 momjian Exp $ + * $Id: port-protos.h,v 1.4 1997/12/19 22:45:59 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -31,8 +31,4 @@ #define pg_dlclose dlclose #define pg_dlerror dlerror -/* port.c */ -extern long random(void); -extern void srandom(int seed); - #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/irix5/port-protos.h b/src/backend/port/irix5/port-protos.h index 2babb773e0f..a7fcfa991cc 100644 --- a/src/backend/port/irix5/port-protos.h +++ b/src/backend/port/irix5/port-protos.h @@ -31,7 +31,4 @@ #define pg_dlclose dlclose #define pg_dlerror dlerror -/* port.c */ -extern long random(void); - #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/sparc_solaris/port-protos.h b/src/backend/port/sparc_solaris/port-protos.h index 3f15b052c93..11434e254b5 100644 --- a/src/backend/port/sparc_solaris/port-protos.h +++ b/src/backend/port/sparc_solaris/port-protos.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: port-protos.h,v 1.7 1997/09/18 16:09:14 scrappy Exp $ + * $Id: port-protos.h,v 1.8 1997/12/19 22:46:15 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -35,22 +35,4 @@ #define pg_dlclose dlclose #define pg_dlerror dlerror -/* port.c */ -#ifndef HAVE_RANDOM -extern long random(void); -#endif -#ifndef HAVE_SRANDOM -extern void srandom(int seed); -#endif - -/* inet_aton.c in backend/port directory */ -extern int inet_aton(const char *cp, struct in_addr * addr); - -/* In system library, but can't find prototype in system library .h files */ -extern int gethostname(char *name, int namelen); - -/* In system library, but can't find prototype in system library .h files */ -#include <sys/resource.h> -extern int getrusage(int who, struct rusage * rusage); - #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/svr4/port-protos.h b/src/backend/port/svr4/port-protos.h index 3926b253429..97d23fe6ac8 100644 --- a/src/backend/port/svr4/port-protos.h +++ b/src/backend/port/svr4/port-protos.h @@ -31,8 +31,4 @@ #define pg_dlclose dlclose #define pg_dlerror dlerror -/* port.c */ -extern long random(void); -extern void srandom(int seed); - #endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/ultrix4/port-protos.h b/src/backend/port/ultrix4/port-protos.h index 091e8528418..fc3b40c7629 100644 --- a/src/backend/port/ultrix4/port-protos.h +++ b/src/backend/port/ultrix4/port-protos.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: port-protos.h,v 1.7 1997/09/08 02:27:36 momjian Exp $ + * $Id: port-protos.h,v 1.8 1997/12/19 22:46:47 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -40,15 +40,4 @@ extern int syscall(); extern void init_address_fixup(void); -/* strdup.c: strdup() is not part of libc on Ultrix */ -extern char *strdup(char const *); - -/* inet_aton() is not part of libc on Ultrix. The following is from - backend/port/inet_aton.h -*/ - -struct in_addr; -int - inet_aton(const char *cp, struct in_addr * addr); - #endif /* PORT_PORTOS_H */ diff --git a/src/backend/port/univel/frontend-port-protos.h b/src/backend/port/univel/frontend-port-protos.h deleted file mode 100644 index 215633b6b72..00000000000 --- a/src/backend/port/univel/frontend-port-protos.h +++ /dev/null @@ -1,22 +0,0 @@ -/*------------------------------------------------------------------------- - * - * port-protos.h-- - * port-specific prototypes for Intel x86/Intel SVR4 - * - * - * Copyright (c) 1994, Regents of the University of California - * - * port-protos.h,v 1.2 1995/03/17 06:40:18 andrew Exp - * - *------------------------------------------------------------------------- - */ -#ifndef FPORT_PROTOS_H -#define FPORT_PROTOS_H - -/* port.c */ -extern long random(void); -extern void srandom(int seed); -extern int strcasecmp(char *s1, char *s2); -extern int gethostname(char *name, int namelen); - -#endif /* FPORT_PROTOS_H */ diff --git a/src/backend/port/univel/port-protos.h b/src/backend/port/univel/port-protos.h index a4af145110a..97d23fe6ac8 100644 --- a/src/backend/port/univel/port-protos.h +++ b/src/backend/port/univel/port-protos.h @@ -31,10 +31,4 @@ #define pg_dlclose dlclose #define pg_dlerror dlerror -/* port.c */ -extern long random(void); -extern void srandom(int seed); -extern int strcasecmp(char *s1, char *s2); -extern int gethostname(char *name, int namelen); - #endif /* PORT_PROTOS_H */ diff --git a/src/include/config.h.in b/src/include/config.h.in index a3b4d181d43..cad0854013b 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -58,6 +58,9 @@ /* Set to 1 if you have gethostname() */ #undef HAVE_GETHOSTNAME +#ifndef GETHOSTNAME +extern int gethostname(char *name, int namelen); +#endif /* Set to 1 if you have int timezone */ #undef HAVE_INT_TIMEZONE @@ -67,6 +70,9 @@ /* Set to 1 if you have inet_aton() */ #undef HAVE_INET_ATON +#ifndef HAVE_INET_ATON +extern int inet_aton(const char *cp, struct in_addr * addr); +#endif /* Set to 1 if you have fcvt() */ #undef HAVE_FCVT @@ -104,14 +110,29 @@ /* Set to 1 if you have sigprocmask() */ #undef HAVE_SIGPROCMASK +/* Set to 1 if you have sigprocmask() */ +#undef HAVE_STRCASECMP +#ifndef HAVE_STRCASECMP +extern int strcasecmp(char *s1, char *s2); +#endif + /* Set to 1 if you have strdup() */ #undef HAVE_STRDUP +#ifndef HAVE_STRDUP +extern char *strdup(char const *); +#endif /* Set to 1 if you have random() */ #undef HAVE_RANDOM +#ifndef HAVE_RANDOM +extern long random(void); +#endif /* Set to 1 if you have srandom() */ #undef HAVE_SRANDOM +#ifndef HAVE_SRANDOM +extern void srandom(int seed); +#endif /* Set to 1 if you have libreadline.a */ #undef HAVE_LIBREADLINE -- GitLab