Un-break ecpg tests for Windows.

tglsfdc · tglsfdc · commit 10a53cae9993 · 2019-06-02T11:07:54.000-04:00
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 7640f93 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.
diff --git a/src/interfaces/ecpg/test/expected/compat_informix-dec_test.c b/src/interfaces/ecpg/test/expected/compat_informix-dec_test.c
@@ -33,7 +33,7 @@
  * print_double(x) has the same effect as printf("%g", x), but is intended
  * to produce the same formatting across all platforms.
  */
-static inline void
+static void
 print_double(double x)
 {
 #ifdef WIN32
diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c
@@ -29,7 +29,7 @@
  * print_double(x) has the same effect as printf("%g", x), but is intended
  * to produce the same formatting across all platforms.
  */
-static inline void
+static void
 print_double(double x)
 {
 #ifdef WIN32
diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c
@@ -30,7 +30,7 @@
  * print_double(x) has the same effect as printf("%g", x), but is intended
  * to produce the same formatting across all platforms.
  */
-static inline void
+static void
 print_double(double x)
 {
 #ifdef WIN32
diff --git a/src/interfaces/ecpg/test/printf_hack.h b/src/interfaces/ecpg/test/printf_hack.h
@@ -2,7 +2,7 @@
  * print_double(x) has the same effect as printf("%g", x), but is intended
  * to produce the same formatting across all platforms.
  */
-static inline void
+static void
 print_double(double x)
 {
 #ifdef WIN32
diff --git a/src/tools/pginclude/cpluspluscheck b/src/tools/pginclude/cpluspluscheck
@@ -105,6 +105,8 @@ do
 
 	# regression.h is not actually C, but ECPG code.
 	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,
 	# which itself contains C++ code and so won't compile with a C++

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`* print_double(x) has the same effect as printf("%g", x), but is intended`
`34`	`34`	`* to produce the same formatting across all platforms.`
`35`	`35`	`*/`
`36`		`-static inline void`
	`36`	`+static void`
`37`	`37`	`print_double(double x)`
`38`	`38`	`{`
`39`	`39`	`#ifdef WIN32`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* print_double(x) has the same effect as printf("%g", x), but is intended`
`30`	`30`	`* to produce the same formatting across all platforms.`
`31`	`31`	`*/`
`32`		`-static inline void`
	`32`	`+static void`
`33`	`33`	`print_double(double x)`
`34`	`34`	`{`
`35`	`35`	`#ifdef WIN32`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`* print_double(x) has the same effect as printf("%g", x), but is intended`
`31`	`31`	`* to produce the same formatting across all platforms.`
`32`	`32`	`*/`
`33`		`-static inline void`
	`33`	`+static void`
`34`	`34`	`print_double(double x)`
`35`	`35`	`{`
`36`	`36`	`#ifdef WIN32`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* print_double(x) has the same effect as printf("%g", x), but is intended`
`3`	`3`	`* to produce the same formatting across all platforms.`
`4`	`4`	`*/`
`5`		`-static inline void`
	`5`	`+static void`
`6`	`6`	`print_double(double x)`
`7`	`7`	`{`
`8`	`8`	`#ifdef WIN32`