diff options
| author | Tom Lane | 2006-11-21 23:26:47 +0000 |
|---|---|---|
| committer | Tom Lane | 2006-11-21 23:26:47 +0000 |
| commit | 617f123f06691d0391664464ed85e05e5523dcbd (patch) | |
| tree | e328e212be4ba37929374552fe638b6d9379f594 /src/bin | |
| parent | d735804f88cc5e5d240b7fac5d8d618d7938ed13 (diff) | |
Get rid of retail definitions of HAVE_STRDUP and HAVE_VSNPRINTF in
some of the Windows-only makefiles; the correct place to assert these
things is pg_config.h.win32. Per bug #2677.
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/pg_config/win32.mak | 2 | ||||
| -rw-r--r-- | src/bin/pg_dump/win32.mak | 2 | ||||
| -rw-r--r-- | src/bin/psql/bcc32.mak | 2 | ||||
| -rw-r--r-- | src/bin/psql/win32.mak | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/pg_config/win32.mak b/src/bin/pg_config/win32.mak index 98b2e70ccbf..a0fccf321ff 100644 --- a/src/bin/pg_config/win32.mak +++ b/src/bin/pg_config/win32.mak @@ -53,7 +53,7 @@ CLEAN : CPP_PROJ=/nologo $(OPT) /W3 /EHsc /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\ "_MBCS" /Fp"$(INTDIR)\pg_config.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \ /I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \ - /I ..\..\include\port\win32_msvc /D "HAVE_STRDUP" /D "FRONTEND" \ + /I ..\..\include\port\win32_msvc /D "FRONTEND" \ /D "_CRT_SECURE_NO_DEPRECATE" CPP_OBJS=$(INTDIR)/ diff --git a/src/bin/pg_dump/win32.mak b/src/bin/pg_dump/win32.mak index 695a7ce0575..5b4fce82cad 100644 --- a/src/bin/pg_dump/win32.mak +++ b/src/bin/pg_dump/win32.mak @@ -32,7 +32,7 @@ CPP_PROJ=/nologo $(OPT) /W3 /EHsc /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\ "_MBCS" /Fp"$(INTDIR)\pg_dump.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \ /I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \ /I ..\..\include\port\win32_msvc /I ..\..\backend \ - /D "HAVE_STRDUP" /D "FRONTEND" /D "_CRT_SECURE_NO_DEPRECATE" + /D "FRONTEND" /D "_CRT_SECURE_NO_DEPRECATE" CPP_OBJS=$(INTDIR)/ CPP_SBRS=. diff --git a/src/bin/psql/bcc32.mak b/src/bin/psql/bcc32.mak index 5a6caeef6e6..d429a5b9e4a 100644 --- a/src/bin/psql/bcc32.mak +++ b/src/bin/psql/bcc32.mak @@ -82,7 +82,7 @@ LIBRARIES = cw32mt.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpq.lib .path.obj = $(INTDIR) -USERDEFINES = WIN32;_CONSOLE;_MBCS;HAVE_STRDUP +USERDEFINES = WIN32;_CONSOLE;_MBCS ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe" diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak index 2d88c51acb3..f0fe208fe5d 100644 --- a/src/bin/psql/win32.mak +++ b/src/bin/psql/win32.mak @@ -30,7 +30,7 @@ CPP_PROJ=/nologo $(OPT) /W3 /EHsc /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\ "_MBCS" /Fp"$(INTDIR)\psql.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \ /I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \ /I ..\..\include\port\win32_msvc /I ..\pg_dump /I ..\..\backend \ - /D "HAVE_STRDUP" /D "FRONTEND" /D "_CRT_SECURE_NO_DEPRECATE" + /D "FRONTEND" /D "_CRT_SECURE_NO_DEPRECATE" CPP_OBJS=$(INTDIR)/ CPP_SBRS=. |