diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/libpq/pqcomm.c | 4 | ||||
| -rw-r--r-- | src/backend/libpq/pqsignal.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index 5238865e760..9432d0d2f49 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -29,7 +29,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqcomm.c,v 1.96 2000/06/06 16:04:29 petere Exp $ + * $Id: pqcomm.c,v 1.97 2000/06/11 11:39:50 petere Exp $ * *------------------------------------------------------------------------- */ @@ -315,7 +315,7 @@ StreamServerPort(int family, unsigned short portName, int *fdP) int StreamConnection(int server_fd, Port *port) { - SOCKET_SIZE_TYPE addrlen; + ACCEPT_TYPE_ARG3 addrlen; /* accept connection (and fill in the client (remote) address) */ addrlen = sizeof(port->raddr); diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c index 457463c30fb..04ebd7dd57c 100644 --- a/src/backend/libpq/pqsignal.c +++ b/src/backend/libpq/pqsignal.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.14 2000/01/26 05:56:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.15 2000/06/11 11:39:50 petere Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -17,7 +17,7 @@ * * A NOTE ABOUT SIGNAL HANDLING ACROSS THE VARIOUS PLATFORMS. * - * config.h defines the macro USE_POSIX_SIGNALS for some platforms and + * config.h defines the macro HAVE_POSIX_SIGNALS for some platforms and * not for others. This file and pqsignal.h use that macro to decide * how to handle signalling. * @@ -47,7 +47,7 @@ pqsigfunc pqsignal(int signo, pqsigfunc func) { -#if !defined(USE_POSIX_SIGNALS) +#if !defined(HAVE_POSIX_SIGNALS) return signal(signo, func); #else struct sigaction act, @@ -61,5 +61,5 @@ pqsignal(int signo, pqsigfunc func) if (sigaction(signo, &act, &oact) < 0) return SIG_ERR; return oact.sa_handler; -#endif /* !USE_POSIX_SIGNALS */ +#endif /* !HAVE_POSIX_SIGNALS */ } |