diff options
| author | Andres Freund | 2015-03-11 13:19:54 +0000 |
|---|---|---|
| committer | Andres Freund | 2015-03-11 13:30:01 +0000 |
| commit | bbfd7edae5aa5ad5553d3c7e102f2e450d4380d4 (patch) | |
| tree | d230d006ceb7bf350abd5c3c25a89b660a8d3193 /src/include/parser | |
| parent | 66ece312f99f384bd33e4342580e78b0eebf0e74 (diff) | |
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/include/parser')
| -rw-r--r-- | src/include/parser/parse_relation.h | 4 | ||||
| -rw-r--r-- | src/include/parser/scanner.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index c886335e85b..fc0a2577f31 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -85,9 +85,9 @@ extern bool isLockedRefname(ParseState *pstate, const char *refname); extern void addRTEtoQuery(ParseState *pstate, RangeTblEntry *rte, bool addToJoinList, bool addToRelNameSpace, bool addToVarNameSpace); -extern void errorMissingRTE(ParseState *pstate, RangeVar *relation) __attribute__((noreturn)); +extern void errorMissingRTE(ParseState *pstate, RangeVar *relation) pg_attribute_noreturn; extern void errorMissingColumn(ParseState *pstate, - char *relname, char *colname, int location) __attribute__((noreturn)); + char *relname, char *colname, int location) pg_attribute_noreturn; extern void expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up, int location, bool include_dropped, List **colnames, List **colvars); diff --git a/src/include/parser/scanner.h b/src/include/parser/scanner.h index 535e864e368..0e22d031f14 100644 --- a/src/include/parser/scanner.h +++ b/src/include/parser/scanner.h @@ -124,6 +124,6 @@ extern void scanner_finish(core_yyscan_t yyscanner); extern int core_yylex(core_YYSTYPE *lvalp, YYLTYPE *llocp, core_yyscan_t yyscanner); extern int scanner_errposition(int location, core_yyscan_t yyscanner); -extern void scanner_yyerror(const char *message, core_yyscan_t yyscanner) __attribute__((noreturn)); +extern void scanner_yyerror(const char *message, core_yyscan_t yyscanner) pg_attribute_noreturn; #endif /* SCANNER_H */ |