diff options
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/libpq/libpq-fe.h | 8 | ||||
| -rw-r--r-- | src/interfaces/libpq/win32.mak | 22 |
2 files changed, 24 insertions, 6 deletions
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index 4cd45fca6c3..0e2112c1595 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-fe.h,v 1.38 1998/08/17 03:50:40 scrappy Exp $ + * $Id: libpq-fe.h,v 1.39 1998/08/29 04:05:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,9 +21,13 @@ extern "C" #include <stdio.h> /* these wouldn't need to be included if PGSockAddr weren't exported: */ +#ifdef WIN32 +#include <winsock.h> +#else #include <sys/socket.h> #include <sys/un.h> #include <netinet/in.h> +#endif /* ---------------- * include stuff common to fe and be * ---------------- @@ -141,7 +145,9 @@ extern "C" { struct sockaddr sa; struct sockaddr_in in; +#ifndef WIN32 struct sockaddr_un un; +#endif } PGSockAddr; /* large-object-access data ... allocated only if large-object code is used. diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak index 4c50caf5e4b..41d28189dcd 100644 --- a/src/interfaces/libpq/win32.mak +++ b/src/interfaces/libpq/win32.mak @@ -11,6 +11,7 @@ NULL=nul !ENDIF CPP=cl.exe +RSC=rc.exe OUTDIR=.\Release INTDIR=.\Release @@ -28,10 +29,14 @@ CLEAN : -@erase "$(INTDIR)\fe-lobj.obj" -@erase "$(INTDIR)\fe-misc.obj" -@erase "$(INTDIR)\fe-print.obj" - -@erase "$(OUTDIR)\libpqdll.obj" - -@erase "$(INTDIR)\vc50.idb" + -@erase "$(OUTDIR)\libpqdll.obj" -@erase "$(OUTDIR)\libpq.lib" - -@erase "$(OUTDIR)\libpq.dll" + -@erase "$(OUTDIR)\libpq.dll" + -@erase "$(OUTDIR)\libpq.res" + -@erase "vc50.pch" + -@erase "$(OUTDIR)\libpq.pch" + -@erase "$(OUTDIR)\libpqdll.exp" + -@erase "$(OUTDIR)\libpqdll.lib" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -53,6 +58,8 @@ LIB32_OBJS= \ "$(INTDIR)\fe-misc.obj" \ "$(INTDIR)\fe-print.obj" +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res" + LINK32=link.exe LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib wsock32.lib\ @@ -61,7 +68,8 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ /implib:"$(OUTDIR)\libpqdll.lib" /def:libpqdll.def LINK32_OBJS= \ "$(INTDIR)\libpqdll.obj" \ - "$(OUTDIR)\libpq.lib" + "$(OUTDIR)\libpq.lib" \ + "$(OUTDIR)\libpq.res" "$(OUTDIR)\libpq.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) @@ -69,7 +77,11 @@ LINK32_OBJS= \ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) << -"$(OUTDIR)\libpq.dll" : "$(OUTDIR)" "$(OUTDIR)\libpqdll.obj" "$(INTDIR)\libpqdll.obj" +"$(INTDIR)\libpq.res" : "$(INTDIR)" libpq.rc + $(RSC) $(RSC_PROJ) libpq.rc + + +"$(OUTDIR)\libpq.dll" : "$(OUTDIR)" "$(OUTDIR)\libpqdll.obj" "$(INTDIR)\libpqdll.obj" "$(INTDIR)\libpq.res" $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << |