diff options
| author | Andres Freund <andres@anarazel.de> | 2015-03-11 14:19:54 +0100 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2015-03-11 14:30:01 +0100 |
| commit | bbfd7edae5aa5ad5553d3c7e102f2e450d4380d4 (patch) | |
| tree | d230d006ceb7bf350abd5c3c25a89b660a8d3193 /src/interfaces/libpq/libpq-int.h | |
| parent | 66ece312f99f384bd33e4342580e78b0eebf0e74 (diff) | |
| download | postgresql-bbfd7edae5aa5ad5553d3c7e102f2e450d4380d4.tar.gz postgresql-bbfd7edae5aa5ad5553d3c7e102f2e450d4380d4.zip | |
Add macros wrapping all usage of gcc's __attribute__.
Until now __attribute__() was defined to be empty for all compilers but
gcc. That's problematic because it prevents using it in other compilers;
which is necessary e.g. for atomics portability. It's also just
generally dubious to do so in a header as widely included as c.h.
Instead add pg_attribute_format_arg, pg_attribute_printf,
pg_attribute_noreturn macros which are implemented in the compilers that
understand them. Also add pg_attribute_noreturn and pg_attribute_packed,
but don't provide fallbacks, since they can affect functionality.
This means that external code that, possibly unwittingly, relied on
__attribute__ defined to be empty on !gcc compilers may now run into
warnings or errors on those compilers. But there shouldn't be many
occurances of that and it's hard to work around...
Discussion: 54B58BA3.8040302@ohmu.fi
Author: Oskari Saarenmaa, with some minor changes by me.
Diffstat (limited to 'src/interfaces/libpq/libpq-int.h')
| -rw-r--r-- | src/interfaces/libpq/libpq-int.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index 64579d29404..b9b630a222f 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -548,7 +548,7 @@ extern PGresult *pqPrepareAsyncResult(PGconn *conn); extern void pqInternalNotice(const PGNoticeHooks *hooks, const char *fmt,...) /* This lets gcc check the format string for consistency. */ -__attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3))); +pg_attribute_printf(2, 3); extern void pqSaveMessageField(PGresult *res, char code, const char *value); extern void pqSaveParameterStatus(PGconn *conn, const char *name, @@ -653,10 +653,10 @@ extern ssize_t pgtls_write(PGconn *conn, const void *ptr, size_t len); #ifdef ENABLE_NLS extern char * libpq_gettext(const char *msgid) -__attribute__((format_arg(1))); +pg_attribute_format_arg(1); extern char * libpq_ngettext(const char *msgid, const char *msgid_plural, unsigned long n) -__attribute__((format_arg(1))) __attribute__((format_arg(2))); +pg_attribute_format_arg(1) pg_attribute_format_arg(2); #else #define libpq_gettext(x) (x) #define libpq_ngettext(s, p, n) ((n) == 1 ? (s) : (p)) |