diff options
Diffstat (limited to 'src/interfaces/libpq')
| -rw-r--r-- | src/interfaces/libpq/Makefile | 5 | ||||
| -rw-r--r-- | src/interfaces/libpq/pqsignal.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/win32.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index bba7b37771..978aa24b13 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.96 2003/11/30 06:09:50 momjian Exp $ +# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.97 2004/02/02 00:11:31 momjian Exp $ # #------------------------------------------------------------------------- @@ -33,6 +33,9 @@ endif # shared library link. (The order in which you list them here doesn't # matter.) SHLIB_LINK += $(filter -lcrypt -ldes -lkrb -lcom_err -lcrypto -lk5crypto -lkrb5 -lssl -lsocket -lnsl -lresolv -lintl, $(LIBS)) $(THREAD_LIBS) +ifeq ($(PORTNAME), win32) +SHLIB_LINK += -lwsock32 -lws2_32 +endif all: all-lib diff --git a/src/interfaces/libpq/pqsignal.c b/src/interfaces/libpq/pqsignal.c index 5f41d22810..dca69cd727 100644 --- a/src/interfaces/libpq/pqsignal.c +++ b/src/interfaces/libpq/pqsignal.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.c,v 1.19 2004/01/09 02:02:43 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.c,v 1.20 2004/02/02 00:11:31 momjian Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -44,6 +44,7 @@ pqsignal(int signo, pqsigfunc func) pqsigfunc pqsignalinquire(int signo) { +#ifndef WIN32 #if !defined(HAVE_POSIX_SIGNALS) pqsigfunc old_sigfunc; int old_sigmask; @@ -61,4 +62,7 @@ pqsignalinquire(int signo) return SIG_ERR; return oact.sa_handler; #endif /* !HAVE_POSIX_SIGNALS */ +#else + return SIG_DFL; +#endif } diff --git a/src/interfaces/libpq/win32.c b/src/interfaces/libpq/win32.c index de83c38e85..96097bca59 100644 --- a/src/interfaces/libpq/win32.c +++ b/src/interfaces/libpq/win32.c @@ -22,7 +22,9 @@ #define WIN32_LEAN_AND_MEAN #define WIN32_EXTRA_LEAN #define VC_EXTRALEAN +#ifndef __MINGW32__ #define NOGDI +#endif #define NOCRYPT #include <windows.h> |