Commited95aea

committed

MSVC/BCC Win32 compiler fixes.

Hiroshi Saito

1 parent0420905 commited95aeaCopy full SHA for ed95aea

File tree

+28

-3

lines changed

+28

-3

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,11 @@ ALL : "..\..\port\pg_config_paths.h" "$(OUTDIR)\pg_config.exe"`
`26`	`26`
`27`	`27`	`CLEAN :`
`28`	`28`	`-@erase"$(INTDIR)\pg_config.obj"`
	`29`	`+-@erase"$(INTDIR)\pgstrcasecmp.obj"`
	`30`	`+-@erase"$(OUTDIR)\path.obj"`
	`31`	`+-@erase"$(OUTDIR)\strlcpy.obj"`
	`32`	`+-@erase"$(INTDIR)\exec.obj"`
	`33`	`+-@erase"$(INTDIR)\snprintf.obj"`
`29`	`34`	`-@erase"$(OUTDIR)\pg_config.exe"`
`30`	`35`	`-@erase"$(INTDIR)\..\..\port\pg_config_paths.h"`
`31`	`36`
`@@ -63,6 +68,7 @@ LINK32_OBJS= \`
`63`	`68`	`"$(INTDIR)\pg_config.obj"\`
`64`	`69`	`"$(INTDIR)\pgstrcasecmp.obj"\`
`65`	`70`	`"$(OUTDIR)\path.obj"\`
	`71`	`+"$(OUTDIR)\strlcpy.obj"\`
`66`	`72`	`"$(INTDIR)\exec.obj"\`
`67`	`73`	`"$(INTDIR)\snprintf.obj"\`
`68`	`74`	`!IFDEF DEBUG`
`@@ -81,6 +87,11 @@ LINK32_OBJS= \`
`81`	`87`	`$(CPP_PROJ) ..\..\port\path.c`
`82`	`88`	`<<`
`83`	`89`
	`90`	`+"$(OUTDIR)\strlcpy.obj" : "$(OUTDIR)" ..\..\port\strlcpy.c`
	`91`	`+ $(CPP) @<<`
	`92`	`+ $(CPP_PROJ) ..\..\port\strlcpy.c`
	`93`	`+<<`
	`94`	`+`
`84`	`95`	`"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c`
`85`	`96`	`$(CPP) @<<`
`86`	`97`	`$(CPP_PROJ) ..\..\port\pgstrcasecmp.c`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,11 @@ CLEAN :`
`55`	`55`	`-@erase"$(INTDIR)\getopt.obj"`
`56`	`56`	`-@erase"$(INTDIR)\getopt_long.obj"`
`57`	`57`	`-@erase"$(INTDIR)\path.obj"`
	`58`	`+-@erase"$(INTDIR)\strlcpy.obj"`
`58`	`59`	`-@erase"$(INTDIR)\pgstrcasecmp.obj"`
`59`	`60`	`-@erase"$(INTDIR)\sprompt.obj"`
`60`	`61`	`-@erase"$(INTDIR)\snprintf.obj"`
`61`		`--@erase"$(INTDIR)\pg_dump.pch"`
	`62`	`+#-@erase "$(INTDIR)\pg_dump.pch"`
`62`	`63`	`-@erase "$(OUTDIR)\pg_dump.obj"`
`63`	`64`	`-@erase "$(OUTDIR)\pg_dump.exe"`
`64`	`65`	`-@erase "$(INTDIR)\pg_dumpall.obj"`
`@@ -93,6 +94,7 @@ LINK32_OBJS= \`
`93`	`94`	`"$(INTDIR)\getopt.obj"\`
`94`	`95`	`"$(INTDIR)\getopt_long.obj"\`
`95`	`96`	`"$(INTDIR)\path.obj"\`
	`97`	`+"$(INTDIR)\strlcpy.obj"\`
`96`	`98`	`"$(INTDIR)\pgstrcasecmp.obj"\`
`97`	`99`	`"$(INTDIR)\sprompt.obj"\`
`98`	`100`	`"$(INTDIR)\snprintf.obj"`
`@@ -166,6 +168,11 @@ LINK32_OBJS= $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib"`
`166`	`168`	`$(CPP_PROJ) ..\..\port\path.c`
`167`	`169`	`<<`
`168`	`170`
	`171`	`+"$(INTDIR)\strlcpy.obj" : "$(INTDIR)" ..\..\port\strlcpy.c`
	`172`	`+ $(CPP) @<<`
	`173`	`+ $(CPP_PROJ) ..\..\port\strlcpy.c`
	`174`	`+<<`
	`175`	`+`
`169`	`176`	`"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c`
`170`	`177`	`$(CPP) @<<`
`171`	`178`	`$(CPP_PROJ) ..\..\port\pgstrcasecmp.c`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ CLEAN :`
`59`	`59`	`-@erase"$(INTDIR)\getopt_long.obj"`
`60`	`60`	`-@erase"$(INTDIR)\snprintf.obj"`
`61`	`61`	`-@erase"$(INTDIR)\path.obj"`
	`62`	`+-@erase"$(INTDIR)\strlcpy.obj"`
`62`	`63`	`-@erase"$(INTDIR)\pgstrcasecmp.obj"`
`63`	`64`	`-@erase"$(INTDIR)\sprompt.obj"`
`64`	`65`	`-@erase"$(INTDIR)\dumputils.obj"`
`@@ -94,6 +95,7 @@ LINK32_OBJS= \`
`94`	`95`	`"$(INTDIR)\getopt_long.obj"\`
`95`	`96`	`"$(INTDIR)\snprintf.obj"\`
`96`	`97`	`"$(INTDIR)\path.obj"\`
	`98`	`+"$(INTDIR)\strlcpy.obj"\`
`97`	`99`	`"$(INTDIR)\pgstrcasecmp.obj"\`
`98`	`100`	`"$(INTDIR)\sprompt.obj"\`
`99`	`101`	`"$(INTDIR)\dumputils.obj"\`
`@@ -151,6 +153,11 @@ LINK32_OBJS= $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib"`
`151`	`153`	`$(CPP_PROJ) ..\..\port\path.c`
`152`	`154`	`<<`
`153`	`155`
	`156`	`+"$(INTDIR)\strlcpy.obj" : "$(INTDIR)" ..\..\port\strlcpy.c`
	`157`	`+ $(CPP) @<<`
	`158`	`+ $(CPP_PROJ) ..\..\port\strlcpy.c`
	`159`	`+<<`
	`160`	`+`
`154`	`161`	`"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c`
`155`	`162`	`$(CPP) @<<`
`156`	`163`	`$(CPP_PROJ) ..\..\port\pgstrcasecmp.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,8 @@ CLEAN :`
`74`	`74`	`-@erase"$(OUTDIR)\$(OUTFILENAME)dll.lib"`
`75`	`75`	`-@erase"$(OUTDIR)\libpq.res"`
`76`	`76`	`-@erase"$(OUTDIR)\$(OUTFILENAME).dll"`
`77`		`--@erase"*.pch"`
`78`		`--@erase"$(OUTDIR)\libpq.pch"`
	`77`	`+#-@erase "*.pch"`
	`78`	`+#-@erase "$(OUTDIR)\libpq.pch"`
`79`	`79`	`-@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp"`
`80`	`80`	`-@erase "$(INTDIR)\pg_config_paths.h"`
`81`	`81`

Comments

(0)