database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-05 07:21:24 +03:00
Code Activity

Un-break ecpg tests for Windows.

Browse Source 
Declaring a function "inline" still doesn't work with Windows compilers
(C99? what's that?), unless the macro provided by pg_config.h is
in-scope, which it is not in our ECPG test programs.  So the workaround
I tried to use in commit 7640f9312 doesn't work for Windows.  Revert
the change in printf_hack.h, and instead just blacklist that file
in cpluspluscheck --- since it's a not-installed test file, we don't
really need to verify its C++ cleanliness anyway.
This commit is contained in:
Tom Lane
2019-06-02 11:07:54 -04:00
parent 4b3f1dd71b
commit 10a53cae99
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/ecpg/test/expected/compat_informix-dec_test.c
View File

@ -33,7 +33,7 @@
* print_double(x) has the same effect as printf("%g", x), but is intended * print_double(x) has the same effect as printf("%g", x), but is intended
* to produce the same formatting across all platforms. * to produce the same formatting across all platforms.
*/ */
static inline void static void
print_double(double x) print_double(double x)
{ {
#ifdef WIN32 #ifdef WIN32

2
src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c
View File

@ -29,7 +29,7 @@
* print_double(x) has the same effect as printf("%g", x), but is intended * print_double(x) has the same effect as printf("%g", x), but is intended
* to produce the same formatting across all platforms. * to produce the same formatting across all platforms.
*/ */
static inline void static void
print_double(double x) print_double(double x)
{ {
#ifdef WIN32 #ifdef WIN32

2
src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c
View File

@ -30,7 +30,7 @@
* print_double(x) has the same effect as printf("%g", x), but is intended * print_double(x) has the same effect as printf("%g", x), but is intended
* to produce the same formatting across all platforms. * to produce the same formatting across all platforms.
*/ */
static inline void static void
print_double(double x) print_double(double x)
{ {
#ifdef WIN32 #ifdef WIN32

2
src/interfaces/ecpg/test/printf_hack.h
View File

@ -2,7 +2,7 @@
* print_double(x) has the same effect as printf("%g", x), but is intended * print_double(x) has the same effect as printf("%g", x), but is intended
* to produce the same formatting across all platforms. * to produce the same formatting across all platforms.
*/ */
static inline void static void
print_double(double x) print_double(double x)
{ {
#ifdef WIN32 #ifdef WIN32

2
src/tools/pginclude/cpluspluscheck
View File

@ -105,6 +105,8 @@ do
# regression.h is not actually C, but ECPG code. # regression.h is not actually C, but ECPG code.
test "$f" = src/interfaces/ecpg/test/regression.h && continue test "$f" = src/interfaces/ecpg/test/regression.h && continue
# printf_hack.h produces "unused function" warnings.
test "$f" = src/interfaces/ecpg/test/printf_hack.h && continue
# pg_trace.h and utils/probes.h can include sys/sdt.h from SystemTap, # pg_trace.h and utils/probes.h can include sys/sdt.h from SystemTap,
# which itself contains C++ code and so won't compile with a C++ # which itself contains C++ code and so won't compile with a C++