--- src/bin/psql/win32.mak.orig	Thu Mar  2 23:02:47 2006
+++ src/bin/psql/win32.mak	Thu Mar  2 23:06:24 2006
@@ -29,6 +29,7 @@
 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 @@
 	-@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 @@
 	"$(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"
@@ -147,6 +152,16 @@
 "$(INTDIR)\sprompt.obj" : "$(INTDIR)" ..\..\port\sprompt.c
     $(CPP) @<<
     $(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
--- src/include/pg_config.h.win32.orig	Thu Mar  2 22:46:01 2006
+++ src/include/pg_config.h.win32	Thu Mar  2 22:46:45 2006
@@ -13,6 +13,7 @@
 #define ACCEPT_TYPE_ARG3 int
 
 #define MAXPGPATH 1024
+#define MEMSET_LOOP_LIMIT 1024
 
 #define INDEX_MAX_KEYS 32
 
--- src/win32.mak.orig	Thu Mar  2 23:07:38 2006
+++ src/win32.mak	Thu Mar  2 23:08:01 2006
@@ -20,8 +20,6 @@
    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 ..\..
@@ -33,8 +31,6 @@
    cd ..\..\bin\psql
    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