diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-06-19 13:10:56 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-06-19 13:10:56 +0000 |
| commit | 624789d1919ee8578b6f3c367d99110ad7e4e2d0 (patch) | |
| tree | a723a1a45c2fc800cad36e73d6e0fc8c8679120a /src | |
| parent | a11333fab74fa84c72026a4250bb47ca4fc9518e (diff) | |
| download | postgresql-624789d1919ee8578b6f3c367d99110ad7e4e2d0.tar.gz postgresql-624789d1919ee8578b6f3c367d99110ad7e4e2d0.zip | |
Cleanup for Win32 compile.
Andreas Pflug
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/psql/win32.mak | 18 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 5 | ||||
| -rw-r--r-- | 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 54254b26ddc..8c4a0738ec9 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 9331c7c1746..3524bb93856 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 a1ce3ea02d4..66e8eb6d9bd 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) $< |