NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit10a53ca

committed

Un-break ecpg tests for Windows.

Declaring a function "inline" still doesn't work with Windows compilers(C99? what's that?), unless the macro provided by pg_config.h isin-scope, which it is not in our ECPG test programs. So the workaroundI tried to use in commit7640f93 doesn't work for Windows. Revertthe change in printf_hack.h, and instead just blacklist that filein cpluspluscheck --- since it's a not-installed test file, we don'treally need to verify its C++ cleanliness anyway.

1 parent4b3f1dd commit10a53caCopy full SHA for 10a53ca

File tree

5 files changed

-4

lines changed

src
- interfaces/ecpg/test
  - expected
  - printf_hack.h
- tools/pginclude
  - cpluspluscheck

5 files changed

-4

lines changed

`‎src/interfaces/ecpg/test/expected/compat_informix-dec_test.c`

Lines changed: 1 addition & 1 deletion

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`		`-staticinlinevoid`
	`36`	`+staticvoid`
`37`	`37`	`print_double(doublex)`
`38`	`38`	`{`
`39`	`39`	`#ifdefWIN32`

`‎src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c`

Lines changed: 1 addition & 1 deletion

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`		`-staticinlinevoid`
	`32`	`+staticvoid`
`33`	`33`	`print_double(doublex)`
`34`	`34`	`{`
`35`	`35`	`#ifdefWIN32`

`‎src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c`

Lines changed: 1 addition & 1 deletion

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`		`-staticinlinevoid`
	`33`	`+staticvoid`
`34`	`34`	`print_double(doublex)`
`35`	`35`	`{`
`36`	`36`	`#ifdefWIN32`

`‎src/interfaces/ecpg/test/printf_hack.h`

Lines changed: 1 addition & 1 deletion

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`		`-staticinlinevoid`
	`5`	`+staticvoid`
`6`	`6`	`print_double(doublex)`
`7`	`7`	`{`
`8`	`8`	`#ifdefWIN32`

`‎src/tools/pginclude/cpluspluscheck`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,8 @@ do`
`105`	`105`
`106`	`106`	`# regression.h is not actually C, but ECPG code.`
`107`	`107`	`test"$f" = src/interfaces/ecpg/test/regression.h&&continue`
	`108`	`+# printf_hack.h produces "unused function" warnings.`
	`109`	`+test"$f" = src/interfaces/ecpg/test/printf_hack.h&&continue`
`108`	`110`
`109`	`111`	`# pg_trace.h and utils/probes.h can include sys/sdt.h from SystemTap,`
`110`	`112`	`# which itself contains C++ code and so won't compile with a C++`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit10a53ca

File tree

5 files changed

5 files changed

`‎src/interfaces/ecpg/test/expected/compat_informix-dec_test.c`

`‎src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c`

`‎src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c`

`‎src/interfaces/ecpg/test/printf_hack.h`

`‎src/tools/pginclude/cpluspluscheck`

0 commit comments