mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-24 18:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup for Win32 compile.

Browse Source 
Andreas Pflug
This commit is contained in:
Bruce Momjian 2005-06-19 13:10:56 +00:00
parent a11333fab7
commit 624789d191
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bin/psql/win32.mak
View File

@ -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)"

5
src/interfaces/libpq/fe-connect.c
View File

@ -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))
{

5
src/interfaces/libpq/win32.mak
View File

@ -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) $<