mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of retail definitions of HAVE_STRDUP and HAVE_VSNPRINTF in

Browse Source 
some of the Windows-only makefiles; the correct place to assert these
things is pg_config.h.win32.  Per bug #2677.
This commit is contained in:
Tom Lane 2006-11-21 23:26:47 +00:00
parent d735804f88
commit 617f123f06
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/pg_config/win32.mak
View File

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

2
src/bin/pg_dump/win32.mak
View File

@ -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=.

2
src/bin/psql/bcc32.mak
View File

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

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

@ -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=.

2
src/include/pg_config.h.win32
View File

@ -529,7 +529,7 @@
#define HAVE_UTIME_H 1
/* Define to 1 if you have the `vsnprintf' function. */
/* #undef HAVE_VSNPRINTF */
#define HAVE_VSNPRINTF 1
/* Define to 1 if you have the `waitpid' function. */
/* #undef HAVE_WAITPID */

2
src/interfaces/libpq/bcc32.mak
View File

@ -59,7 +59,7 @@ INTDIR=.\Release
OUTFILENAME=blibpq
USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP;
USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS
CPP=bcc32.exe
CPP_PROJ = -I$(BCB)\include;..\..\include;..\..\include\port\win32;..\..\include\port\win32_msvc;..\..\port -n"$(INTDIR)" -WD -c -D$(USERDEFINES) -tWM \

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

@ -124,7 +124,7 @@ pg_config_paths.h: win32.mak
CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. /D "FRONTEND" $(DEBUGDEF) /D\
"WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" \
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
/D "HAVE_VSNPRINTF" /D "HAVE_STRDUP" /D "_CRT_SECURE_NO_DEPRECATE"
/D "_CRT_SECURE_NO_DEPRECATE"
!IFDEF USE_SSL
CPP_PROJ=$(CPP_PROJ) /D USE_SSL