From 0b1b010c12d6682d0b9d4802f6b014aaef61dfcd Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 3 Mar 2006 23:11:48 +0000
Subject: [PATCH] Fixes for Win32-client only compiles.
Hiroshi Saito
---
src/bin/psql/win32.mak | 17 ++++++++++++++++-
src/include/pg_config.h.win32 | 1 +
src/win32.mak | 6 +-----
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak
index 62154c026f3..e63004d95f0 100644
--- a/src/bin/psql/win32.mak
+++ b/src/bin/psql/win32.mak
@@ -29,6 +29,7 @@ REFDOCDIR= ../../../doc/src/sgml/ref
CPP_PROJ=/nologo $(OPT) /W3 /GX /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
/I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \
+ /I ..\pg_dump /I ..\..\backend \
/D "HAVE_STRDUP" /D "FRONTEND"
CPP_OBJS=$(INTDIR)/
@@ -59,6 +60,8 @@ CLEAN :
-@erase "$(INTDIR)\path.obj"
-@erase "$(INTDIR)\pgstrcasecmp.obj"
-@erase "$(INTDIR)\sprompt.obj"
+ -@erase "$(INTDIR)\dumputils.obj"
+ -@erase "$(INTDIR)\keywords.obj"
-@erase "$(INTDIR)\*psql.pch"
-@erase "$(OUTDIR)\psql.exe"
-@erase "$(INTDIR)\..\..\port\pg_config_paths.h"
@@ -90,7 +93,9 @@ LINK32_OBJS= \
"$(INTDIR)\getopt_long.obj" \
"$(INTDIR)\path.obj" \
"$(INTDIR)\pgstrcasecmp.obj" \
- "$(INTDIR)\sprompt.obj"
+ "$(INTDIR)\sprompt.obj" \
+ "$(INTDIR)\dumputils.obj" \
+ "$(INTDIR)\keywords.obj"
!IFDEF DEBUG
LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Debug\libpqddll.lib"
@@ -149,6 +154,16 @@ LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib"
$(CPP_PROJ) ..\..\port\sprompt.c
<<
+"$(INTDIR)\dumputils.obj" : "$(INTDIR)" ..\pg_dump\dumputils.c
+ $(CPP) @<<
+ $(CPP_PROJ) ..\pg_dump\dumputils.c
+<<
+
+"$(INTDIR)\keywords.obj" : "$(INTDIR)" ..\..\backend\parser\keywords.c
+ $(CPP) @<<
+ $(CPP_PROJ) ..\..\backend\parser\keywords.c
+<<
+
"sql_help.h" : create_help.pl
$(PERL) create_help.pl $(REFDOCDIR) $@
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index db578af374c..9d356436636 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -13,6 +13,7 @@
#define ACCEPT_TYPE_ARG3 int
#define MAXPGPATH 1024
+#define MEMSET_LOOP_LIMIT 1024
#define INDEX_MAX_KEYS 32
diff --git a/src/win32.mak b/src/win32.mak
index 1e6413c920e..12034cb8a31 100644
--- a/src/win32.mak
+++ b/src/win32.mak
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/win32.mak,v 1.11 2006/02/12 06:11:50 momjian Exp $
+# $PostgreSQL: pgsql/src/win32.mak,v 1.12 2006/03/03 23:11:48 momjian Exp $
# Makefile for Microsoft Visual C++ 5.0 (or compat)
# Top-file makefile for Win32 parts of postgresql.
@@ -20,8 +20,6 @@ ALL:
nmake /f win32.mak $(MAKEMACRO)
cd ..\..\bin\pg_dump
nmake /f win32.mak $(MAKEMACRO)
- cd ..\..\bin\scripts
- nmake /f win32.mak $(MAKEMACRO)
cd ..\..\bin\pg_config
nmake /f win32.mak $(MAKEMACRO)
cd ..\..
@@ -34,8 +32,6 @@ CLEAN:
nmake /f win32.mak CLEAN
cd ..\..\bin\pg_dump
nmake /f win32.mak CLEAN
- cd ..\..\bin\scripts
- nmake /f win32.mak CLEAN
cd ..\..\bin\pg_config
nmake /f win32.mak CLEAN
cd ..\..
--
GitLab