aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2007-08-03 10:47:11 +0000
committerMagnus Hagander <magnus@hagander.net>2007-08-03 10:47:11 +0000
commit3f0245cb241e6b500fe9f12c62514cc58eef33fe (patch)
tree3d191967fbcafdd53145ee15462f144561226772 /src
parent63872601e84ec78fd1942d5779fccedd415c929f (diff)
downloadpostgresql-3f0245cb241e6b500fe9f12c62514cc58eef33fe.tar.gz
postgresql-3f0245cb241e6b500fe9f12c62514cc58eef33fe.zip
Update supported standalone VC++ version to 7.1+ only, and fix
some bad data leftover in win32.mak. Per request from Hiroshi Saito.
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/libpq/win32.mak6
-rw-r--r--src/win32.mak4
2 files changed, 3 insertions, 7 deletions
diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index e4a22568fd6..e7819d22d9c 100644
--- 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 ba8569fcbd9..63f7e67631e 100644
--- 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"