Movatterモバイル変換

Skip to content

postgrespro/postgresproPublic

NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit617f123

tglsfdc

committed

Get rid of retail definitions of HAVE_STRDUP and HAVE_VSNPRINTF in

some of the Windows-only makefiles; the correct place to assert thesethings is pg_config.h.win32. Per bug #2677.

1 parentd735804 commit617f123Copy full SHA for 617f123

File tree

7 files changed

+7

-7

lines changed

src
- bin
  - pg_config
    - win32.mak
  - pg_dump
    - win32.mak
  - psql
    - bcc32.mak
    - win32.mak
- include
  - pg_config.h.win32
- interfaces/libpq
  - bcc32.mak
  - win32.mak

7 files changed

+7

-7

lines changed

`‎src/bin/pg_config/win32.mak`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ CLEAN :`
`53`	`53`	`CPP_PROJ=/nologo$(OPT) /W3 /EHsc /D "WIN32"$(DEBUGDEF) /D "_CONSOLE" /D\`
`54`	`54`	`"_MBCS" /Fp"$(INTDIR)\pg_config.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c\`
`55`	`55`	`/I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32\`
`56`		`- /I ..\..\include\port\win32_msvc /D "HAVE_STRDUP" /D "FRONTEND"\`
	`56`	`+ /I ..\..\include\port\win32_msvc /D "FRONTEND"\`
`57`	`57`	`/D "_CRT_SECURE_NO_DEPRECATE"`
`58`	`58`
`59`	`59`	`CPP_OBJS=$(INTDIR)/`

`‎src/bin/pg_dump/win32.mak`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ CPP_PROJ=/nologo $(OPT) /W3 /EHsc /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\`
`32`	`32`	`"_MBCS" /Fp"$(INTDIR)\pg_dump.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c\`
`33`	`33`	`/I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32\`
`34`	`34`	`/I ..\..\include\port\win32_msvc /I ..\..\backend\`
`35`		`- /D "HAVE_STRDUP" /D "FRONTEND" /D "_CRT_SECURE_NO_DEPRECATE"`
	`35`	`+ /D "FRONTEND" /D "_CRT_SECURE_NO_DEPRECATE"`
`36`	`36`
`37`	`37`	`CPP_OBJS=$(INTDIR)/`
`38`	`38`	`CPP_SBRS=.`

`‎src/bin/psql/bcc32.mak`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ LIBRARIES= cw32mt.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpq.lib`
`82`	`82`
`83`	`83`	`.path.obj =$(INTDIR)`
`84`	`84`
`85`		`-USERDEFINES = WIN32;_CONSOLE;_MBCS;HAVE_STRDUP`
	`85`	`+USERDEFINES = WIN32;_CONSOLE;_MBCS`
`86`	`86`
`87`	`87`	`ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"`
`88`	`88`

`‎src/bin/psql/win32.mak`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ CPP_PROJ=/nologo $(OPT) /W3 /EHsc /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\`
`30`	`30`	`"_MBCS" /Fp"$(INTDIR)\psql.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c\`
`31`	`31`	`/I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32\`
`32`	`32`	`/I ..\..\include\port\win32_msvc /I ..\pg_dump /I ..\..\backend\`
`33`		`- /D "HAVE_STRDUP" /D "FRONTEND" /D "_CRT_SECURE_NO_DEPRECATE"`
	`33`	`+ /D "FRONTEND" /D "_CRT_SECURE_NO_DEPRECATE"`
`34`	`34`
`35`	`35`	`CPP_OBJS=$(INTDIR)/`
`36`	`36`	`CPP_SBRS=.`

`‎src/include/pg_config.h.win32`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@`
`529`	`529`	`#define HAVE_UTIME_H 1`
`530`	`530`
`531`	`531`	/* Define to 1 if you have the `vsnprintf' function. */
`532`		`-/* #undef HAVE_VSNPRINTF*/`
	`532`	`+#define HAVE_VSNPRINTF1`
`533`	`533`
`534`	`534`	/* Define to 1 if you have the `waitpid' function. */
`535`	`535`	`/* #undef HAVE_WAITPID */`

`‎src/interfaces/libpq/bcc32.mak`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ INTDIR=.\Release`
`59`	`59`
`60`	`60`	`OUTFILENAME=blibpq`
`61`	`61`
`62`		`-USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP;`
	`62`	`+USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS`
`63`	`63`
`64`	`64`	`CPP=bcc32.exe`
`65`	`65`	`CPP_PROJ = -I$(BCB)\include;..\..\include;..\..\include\port\win32;..\..\include\port\win32_msvc;..\..\port -n"$(INTDIR)" -WD -c -D$(USERDEFINES) -tWM\`

`‎src/interfaces/libpq/win32.mak`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ pg_config_paths.h: win32.mak`
`124`	`124`	`CPP_PROJ=/nologo /W3 /EHsc$(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. /D "FRONTEND"$(DEBUGDEF) /D\`
`125`	`125`	`"WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch"\`
`126`	`126`	`/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c\`
`127`		`- /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP" /D "_CRT_SECURE_NO_DEPRECATE"`
	`127`	`+ /D "_CRT_SECURE_NO_DEPRECATE"`
`128`	`128`
`129`	`129`	`!IFDEF USE_SSL`
`130`	`130`	`CPP_PROJ=$(CPP_PROJ) /D USE_SSL`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp