Update supported standalone VC++ version to 7.1+ only, and fix

some bad data leftover in win32.mak.

Per request from Hiroshi Saito.

diff --git a/doc/src/sgml/install-win32.sgml b/doc/src/sgml/install-win32.sgml
index f88e17aef32f36add1ce4390374323e4d759aff8..9d96abeaa8d3e460d8024e529fd7ebcffb2e4f0e 100644 (file)
--- a/doc/src/sgml/install-win32.sgml
+++ b/doc/src/sgml/install-win32.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  Installation on <productname>Windows</productname>
@@ -24,7 +24,7 @@
   built for older versions of Windows using
   Cygwin. Finally, the client access library
   (libpq) can be built using
-  Visual C++ 6.0 or 
+  Visual C++ 7.1 or 
   Borland C++ for compatibility with statically
   linked applications built using these tools.
  
@@ -360,7 +360,7 @@
   Borland C++
 
  
-  Using Visual C++ 6.0-8.0 or
+  Using Visual C++ 7.1-8.0 or
   Borland C++ to build libpq is only recommended
   if you need a version with different debug/release flags, or if you need a
   static library to link into an application. For normal use the
@@ -370,7 +370,7 @@
 
  
   To build the libpq client library using
-  Visual Studio 6.0 or later, change into the
+  Visual Studio 7.1 or later, change into the
   src directory and type the command
 
 nmake /f win32.mak

diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index e4a22568fd68dc0cdd242fc5d4b591811b4a971b..e7819d22d9c66d12ddbf2e002bdd36b842b3d046 100644 (file)
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -1,8 +1,4 @@
-<<<<<<< win32.mak
-# Makefile for Microsoft Visual C++ 8.0
-=======
-# Makefile for Microsoft Visual C++ 6.0-8.0
->>>>>>> 1.45
+# Makefile for Microsoft Visual C++ 7.1-8.0
 
 # Will build a static library libpq(d).lib
 #        and a dynamic library libpq(d).dll with import library libpq(d)dll.lib

diff --git a/src/win32.mak b/src/win32.mak
index ba8569fcbd9b40e27de8821a90f29a7a063e375c..63f7e67631ee7591acc60bd96b2f7f4f94b1d133 100644 (file)
--- a/src/win32.mak
+++ b/src/win32.mak
@@ -1,6 +1,6 @@
-# $PostgreSQL: pgsql/src/win32.mak,v 1.15 2007/03/05 14:18:38 mha Exp $
+# $PostgreSQL: pgsql/src/win32.mak,v 1.16 2007/08/03 10:47:10 mha Exp $
 
-# Top-file makefile for building Win32 libpq with Visual C++ 6.0.
+# Top-file makefile for building Win32 libpq with Visual C++ 7.1.
 # (see src/tools/msvc for tools to build with Visual C++ 2005 and newer)
 
 !IF "$(OS)" == "Windows_NT"