8000 Get rid of retail definitions of HAVE_STRDUP and HAVE_VSNPRINTF in · postgrespro/postgres_cluster@617f123 · GitHub
[go: up one dir, main page]
Skip to content

Commit 617f123

Browse files
tglsfdctglsfdc
committed
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.
1 parent d735804 commit 617f123

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

‎src/bin/pg_config/win32.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ CLEAN :
5353
CPP_PROJ=/nologo $(OPT) /W3 /EHsc /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\
5454
"_MBCS" /Fp"$(INTDIR)\pg_config.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
5555
/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" \
5757
/D "_CRT_SECURE_NO_DEPRECATE"
5858

5959
CPP_OBJS=$(INTDIR)/

‎src/bin/pg_dump/win32.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ CPP_PROJ=/nologo $(OPT) /W3 /EHsc /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\
3232
"_MBCS" /Fp"$(INTDIR)\pg_dump.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
3333
/I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \
3434
/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"
3636

3737
CPP_OBJS=$(INTDIR)/
3838
CPP_SBRS=.

‎src/bin/psql/bcc32.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ LIBRARIES = cw32mt.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpq.lib
8282

8383
.path.obj = $(INTDIR)
8484

85-
USERDEFINES = WIN32;_CONSOLE;_MBCS;HAVE_STRDUP
85+
USERDEFINES = WIN32;_CONSOLE;_MBCS
8686

8787
ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
8888

‎src/bin/psql/win32.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ CPP_PROJ=/nologo $(OPT) /W3 /EHsc /D "WIN32" $(DEBUGDEF) /D "_CONSOLE" /D\
3030
"_MBCS" /Fp"$(INTDIR)\psql.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
3131
/I ..\..\include /I ..\..\interfaces\libpq /I ..\..\include\port\win32 \
3232
/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"
3434

3535
CPP_OBJS=$(INTDIR)/
3636
CPP_SBRS=.

‎src/include/pg_config.h.win32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@
529529
#define HAVE_UTIME_H 1
530530

531531
/* Define to 1 if you have the `vsnprintf' function. */
532-
/* #undef HAVE_VSNPRINTF */
532+
#define HAVE_VSNPRINTF 1
533533

534534
/* Define to 1 if you have the `waitpid' function. */
535535
/* #undef HAVE_WAITPID */

‎src/interfaces/libpq/bcc32.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ INTDIR=.\Release
5959

6060
OUTFILENAME=blibpq
6161

62-
USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP;
62+
USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS
6363

6464
CPP=bcc32.exe
6565
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 numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ pg_config_paths.h: win32.mak
124124
CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. /D "FRONTEND" $(DEBUGDEF) /D\
125125
"WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" \
126126
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
127-
/D "HAVE_VSNPRINTF" /D "HAVE_STRDUP" /D "_CRT_SECURE_NO_DEPRECATE"
127+
/D "_CRT_SECURE_NO_DEPRECATE"
128128

129129
!IFDEF USE_SSL
130130
CPP_PROJ=$(CPP_PROJ) /D USE_SSL

0 commit comments

Comments
 (0)
0