Commit624789d

committed

Cleanup for Win32 compile.

Andreas Pflug

1 parenta11333f commit624789dCopy full SHA for 624789d

File tree

+16

-12

lines changed

+16

-12

lines changed

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,15 +99,15 @@ LINK32_OBJS= $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib"`
`99`	`99`	`!ENDIF`
`100`	`100`
`101`	`101`	`"..\..\port\pg_config_paths.h": win32.mak`
`102`		`-echo\#define PGBINDIR"">$@`
`103`		`-echo\#define PGSHAREDIR"">>$@`
`104`		`-echo\#define SYSCONFDIR"">>$@`
`105`		`-echo\#define INCLUDEDIR"">>$@`
`106`		`-echo\#define PKGINCLUDEDIR"">>$@`
`107`		`-echo\#define INCLUDEDIRSERVER"">>$@`
`108`		`-echo\#define LIBDIR"">>$@`
`109`		`-echo\#define PKGLIBDIR"">>$@`
`110`		`-echo\#define LOCALEDIR"">>$@`
	`102`	`+echo#define PGBINDIR "" >$@`
	`103`	`+echo#define PGSHAREDIR "" >>$@`
	`104`	`+echo#define SYSCONFDIR "" >>$@`
	`105`	`+echo#define INCLUDEDIR "" >>$@`
	`106`	`+echo#define PKGINCLUDEDIR "" >>$@`
	`107`	`+echo#define INCLUDEDIRSERVER "" >>$@`
	`108`	`+echo#define LIBDIR "" >>$@`
	`109`	`+echo#define PKGLIBDIR "" >>$@`
	`110`	`+echo#define LOCALEDIR "" >>$@`
`111`	`111`
`112`	`112`	`"$(OUTDIR)" :`
`113`	`113`	`if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.311 2005/06/12 00:07:07 neilc Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.312 2005/06/19 13:10:55 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -3104,6 +3104,8 @@ PasswordFromFile(char hostname, char port, char dbname, char username)`
`3104`	`3104`	`if (stat(pgpassfile,&stat_buf)==-1)`
`3105`	`3105`	`returnNULL;`
`3106`	`3106`
	`3107`	`+#ifndefWIN32`
	`3108`	`+`
`3107`	`3109`	`if (!S_ISREG(stat_buf.st_mode))`
`3108`	`3110`	`{`
`3109`	`3111`	`fprintf(stderr,`
`@@ -3113,7 +3115,6 @@ PasswordFromFile(char hostname, char port, char dbname, char username)`
`3113`	`3115`	`returnNULL;`
`3114`	`3116`	`}`
`3115`	`3117`
`3116`		`-#ifndefWIN32`
`3117`	`3118`	`/* If password file is insecure, alert the user and ignore it. */`
`3118`	`3119`	`if (stat_buf.st_mode& (S_IRWXG \|S_IRWXO))`
`3119`	`3120`	`{`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ pthread.h: pthread.h.win32`
`115`	`115`	`copy pthread.h.win32 pthread.h`
`116`	`116`
`117`	`117`	`pg_config_paths.h: win32.mak`
`118`		`-echo\#define SYSCONFDIR""> pg_config_paths.h`
	`118`	`+echo#define SYSCONFDIR "" > pg_config_paths.h`
`119`	`119`
`120`	`120`	`"$(OUTDIR)" :`
`121`	`121`	`if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"`
`@@ -215,5 +215,8 @@ LINK32_OBJS= \`
`215`	`215`	`$(CPP_PROJ) /I"." ..\..\backend\utils\mb\encnames.c`
`216`	`216`	`<<`
`217`	`217`
	`218`	`+.c{$(CPP_OBJS)}.obj:`
	`219`	`+$(CPP)$(CPP_PROJ)$<`
	`220`	`+`
`218`	`221`	`.c.obj:`
`219`	`222`	`$(CPP)$(CPP_PROJ)$<`

Comments

(0)