The attached patch allows MSCV builds to complete.

The warnings still shown (see recent -hackers email) are identical to those that were present in RC2, so they are not the products of recent homedir changes.

cheers

andrew


Index: interfaces/libpq/fe-connect.c
===================================================================
RCS file: /home/cvsmirror/pgsql/src/interfaces/libpq/fe-connect.c,v
retrieving revision 1.299
diff -c -r1.299 fe-connect.c
*** interfaces/libpq/fe-connect.c	6 Jan 2005 21:41:44 -0000	1.299
--- interfaces/libpq/fe-connect.c	9 Jan 2005 22:43:47 -0000
***************
*** 35,41 ****
--- 35,48 ----
  
  #ifdef WIN32
  #include "win32.h"
+ #ifdef _WIN32_IE
+ #undef _WIN32_IE
+ #endif
  #define _WIN32_IE 0x0400
+ #ifdef near
+ #undef near
+ #endif
+ #define near
  #include <shlobj.h>
  #else
  #include <sys/socket.h>
Index: interfaces/libpq/win32.mak
===================================================================
RCS file: /home/cvsmirror/pgsql/src/interfaces/libpq/win32.mak,v
retrieving revision 1.28
diff -c -r1.28 win32.mak
*** interfaces/libpq/win32.mak	13 Nov 2004 03:18:50 -0000	1.28
--- interfaces/libpq/win32.mak	9 Jan 2005 22:43:47 -0000
***************
*** 138,144 ****
  RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
  
  LINK32=link.exe
! LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib wsock32.lib $(SSL_LIBS)  \
   /nologo /subsystem:windows /dll $(LOPT) /incremental:no\
   /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:I386 /out:"$(OUTDIR)\$(OUTFILENAME).dll"\
   /implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib"  /def:$(OUTFILENAME)dll.def
--- 138,144 ----
  RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
  
  LINK32=link.exe
! LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib $(SSL_LIBS)  \
   /nologo /subsystem:windows /dll $(LOPT) /incremental:no\
   /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:I386 /out:"$(OUTDIR)\$(OUTFILENAME).dll"\
   /implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib"  /def:$(OUTFILENAME)dll.def
Index: port/path.c
===================================================================
RCS file: /home/cvsmirror/pgsql/src/port/path.c,v
retrieving revision 1.49
diff -c -r1.49 path.c
*** port/path.c	6 Jan 2005 21:41:45 -0000	1.49
--- port/path.c	9 Jan 2005 22:43:47 -0000
***************
*** 18,24 ****
--- 18,31 ----
  #include <ctype.h>
  #include <sys/stat.h>
  #ifdef WIN32
+ #ifdef _WIN32_IE
+ #undef _WIN32_IE
+ #endif
  #define _WIN32_IE 0x0400
+ #ifdef near
+ #undef near
+ #endif
+ #define near
  #include <shlobj.h>
  #else
  #include <unistd.h>
---------------------------(end of broadcast)---------------------------
TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]

Reply via email to