hcq/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2026-02-08 06:37:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up *printf macros to avoid conflict with format archetypes.

Browse Source 
We must define the macro "printf" with arguments, else it can mess
up format archetype attributes in builds where PG_PRINTF_ATTRIBUTE
is just "printf".  Fortunately, that's easy to do now that we're
requiring C99; we can use __VA_ARGS__.

On the other hand, it's better not to use __VA_ARGS__ for the rest
of the *printf crew, so that one can take the addresses of those
functions without surprises.

I'd proposed doing this some time ago, but forgot to make it happen;
buildfarm failures subsequent to 96bf88d52 reminded me.

Discussion: https://postgr.es/m/22709.1535135640@sss.pgh.pa.us
Discussion: https://postgr.es/m/20180926190934.ea4xvzhkayuw7gkx@alap3.anarazel.de
This commit is contained in:
Tom Lane
2018-09-26 17:35:01 -04:00
parent a6b88d682c
commit 8b91d25884
3 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pl/plpython/plpython.h
View File

@ -127,13 +127,8 @@ typedef int Py_ssize_t;
#ifdef vsnprintf
#undef vsnprintf
#endif
#ifdef __GNUC__
#define vsnprintf(...) pg_vsnprintf(__VA_ARGS__)
#define snprintf(...) pg_snprintf(__VA_ARGS__)
#else
#define vsnprintf pg_vsnprintf
#define snprintf pg_snprintf
#endif /* __GNUC__ */
/*
* Used throughout, and also by the Python 2/3 porting layer, so it's easier to