提交 903e21b4 编写于 作者: M Marc G. Fournier

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...
上级 4ee5f2b9
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * 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 @@ ...@@ -27,8 +27,5 @@
extern int init_address_fixup(void); extern int init_address_fixup(void);
extern double rint(double x); extern double rint(double x);
extern double cbrt(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 */ #endif /* PORT_PROTOS_H */
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * 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 @@ ...@@ -31,8 +31,4 @@
#define pg_dlclose dlclose #define pg_dlclose dlclose
#define pg_dlerror dlerror #define pg_dlerror dlerror
/* port.c */
extern long random(void);
extern void srandom(int seed);
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */
...@@ -31,7 +31,4 @@ ...@@ -31,7 +31,4 @@
#define pg_dlclose dlclose #define pg_dlclose dlclose
#define pg_dlerror dlerror #define pg_dlerror dlerror
/* port.c */
extern long random(void);
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * 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 @@ ...@@ -35,22 +35,4 @@
#define pg_dlclose dlclose #define pg_dlclose dlclose
#define pg_dlerror dlerror #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 */ #endif /* PORT_PROTOS_H */
...@@ -31,8 +31,4 @@ ...@@ -31,8 +31,4 @@
#define pg_dlclose dlclose #define pg_dlclose dlclose
#define pg_dlerror dlerror #define pg_dlerror dlerror
/* port.c */
extern long random(void);
extern void srandom(int seed);
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * 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(); ...@@ -40,15 +40,4 @@ extern int syscall();
extern void init_address_fixup(void); 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 */ #endif /* PORT_PORTOS_H */
/*-------------------------------------------------------------------------
*
* 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 */
...@@ -31,10 +31,4 @@ ...@@ -31,10 +31,4 @@
#define pg_dlclose dlclose #define pg_dlclose dlclose
#define pg_dlerror dlerror #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 */ #endif /* PORT_PROTOS_H */
...@@ -58,6 +58,9 @@ ...@@ -58,6 +58,9 @@
/* Set to 1 if you have gethostname() */ /* Set to 1 if you have gethostname() */
#undef HAVE_GETHOSTNAME #undef HAVE_GETHOSTNAME
#ifndef GETHOSTNAME
extern int gethostname(char *name, int namelen);
#endif
/* Set to 1 if you have int timezone */ /* Set to 1 if you have int timezone */
#undef HAVE_INT_TIMEZONE #undef HAVE_INT_TIMEZONE
...@@ -67,6 +70,9 @@ ...@@ -67,6 +70,9 @@
/* Set to 1 if you have inet_aton() */ /* Set to 1 if you have inet_aton() */
#undef 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() */ /* Set to 1 if you have fcvt() */
#undef HAVE_FCVT #undef HAVE_FCVT
...@@ -104,14 +110,29 @@ ...@@ -104,14 +110,29 @@
/* Set to 1 if you have sigprocmask() */ /* Set to 1 if you have sigprocmask() */
#undef 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() */ /* Set to 1 if you have strdup() */
#undef HAVE_STRDUP #undef HAVE_STRDUP
#ifndef HAVE_STRDUP
extern char *strdup(char const *);
#endif
/* Set to 1 if you have random() */ /* Set to 1 if you have random() */
#undef HAVE_RANDOM #undef HAVE_RANDOM
#ifndef HAVE_RANDOM
extern long random(void);
#endif
/* Set to 1 if you have srandom() */ /* Set to 1 if you have srandom() */
#undef HAVE_SRANDOM #undef HAVE_SRANDOM
#ifndef HAVE_SRANDOM
extern void srandom(int seed);
#endif
/* Set to 1 if you have libreadline.a */ /* Set to 1 if you have libreadline.a */
#undef HAVE_LIBREADLINE #undef HAVE_LIBREADLINE
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册