From 624789d1919ee8578b6f3c367d99110ad7e4e2d0 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 19 Jun 2005 13:10:56 +0000
Subject: [PATCH] Cleanup for Win32 compile.

Andreas Pflug
---
 src/bin/psql/win32.mak            | 18 +++++++++---------
 src/interfaces/libpq/fe-connect.c |  5 +++--
 src/interfaces/libpq/win32.mak    |  5 ++++-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak
index 54254b26dd..8c4a0738ec 100644
--- a/src/bin/psql/win32.mak
+++ b/src/bin/psql/win32.mak
@@ -99,15 +99,15 @@ LINK32_OBJS	= $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib"
 !ENDIF
 
 "..\..\port\pg_config_paths.h": win32.mak
-	echo \#define PGBINDIR "" >$@
-	echo \#define PGSHAREDIR "" >>$@
-	echo \#define SYSCONFDIR "" >>$@
-	echo \#define INCLUDEDIR "" >>$@
-	echo \#define PKGINCLUDEDIR "" >>$@
-	echo \#define INCLUDEDIRSERVER "" >>$@
-	echo \#define LIBDIR "" >>$@
-	echo \#define PKGLIBDIR "" >>$@
-	echo \#define LOCALEDIR "" >>$@
+	echo #define PGBINDIR "" >$@
+	echo #define PGSHAREDIR "" >>$@
+	echo #define SYSCONFDIR "" >>$@
+	echo #define INCLUDEDIR "" >>$@
+	echo #define PKGINCLUDEDIR "" >>$@
+	echo #define INCLUDEDIRSERVER "" >>$@
+	echo #define LIBDIR "" >>$@
+	echo #define PKGLIBDIR "" >>$@
+	echo #define LOCALEDIR "" >>$@
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 9331c7c174..3524bb9385 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.311 2005/06/12 00:07:07 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.312 2005/06/19 13:10:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3104,6 +3104,8 @@ PasswordFromFile(char *hostname, char *port, char *dbname, char *username)
 	if (stat(pgpassfile, &stat_buf) == -1)
 		return NULL;
 
+#ifndef WIN32
+
 	if (!S_ISREG(stat_buf.st_mode))
 	{
 		fprintf(stderr,
@@ -3113,7 +3115,6 @@ PasswordFromFile(char *hostname, char *port, char *dbname, char *username)
 		return NULL;
 	}
 
-#ifndef WIN32
 	/* If password file is insecure, alert the user and ignore it. */
 	if (stat_buf.st_mode & (S_IRWXG | S_IRWXO))
 	{
diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index a1ce3ea02d..66e8eb6d9b 100644
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -115,7 +115,7 @@ pthread.h: pthread.h.win32
 	copy pthread.h.win32 pthread.h
 
 pg_config_paths.h: win32.mak
-	echo \#define SYSCONFDIR "" > pg_config_paths.h
+	echo #define SYSCONFDIR "" > pg_config_paths.h
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -215,5 +215,8 @@ LINK32_OBJS= \
 	$(CPP_PROJ) /I"." ..\..\backend\utils\mb\encnames.c
 <<
 
+.c{$(CPP_OBJS)}.obj:
+	$(CPP) $(CPP_PROJ) $<
+
 .c.obj:
 	$(CPP) $(CPP_PROJ) $<