diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-07 14:14:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-08-07 14:19:40 (GMT) |
| commit | ae6a5ea5a2119841b4a11b03f879ac426edbbdf8 (patch) | |
| tree | 829a4a3ae3c69630044631a37859dfa0b0b5ef6d /Source | |
| parent | 7c9f0c664f5782c09c686b8e51fe50245463914b (diff) | |
| download | CMake-ae6a5ea5a2119841b4a11b03f879ac426edbbdf8.zip CMake-ae6a5ea5a2119841b4a11b03f879ac426edbbdf8.tar.gz CMake-ae6a5ea5a2119841b4a11b03f879ac426edbbdf8.tar.bz2 | |
Include cmMakefile.h before cm*Lexer.h to get stdint.h first
Some generated cm*Lexer.h headers define preprocessor macros normally
provided by <stdint.h>. The latter is included indrectly by cmMakefile.h
since commit 2268c41a (Optimize custom command full-path dependency
lookup, 2013-08-06). Adjust the order to avoid redefinition warnings.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCommandArgumentParserHelper.cxx | 4 | ||||
| -rw-r--r-- | Source/cmExprParserHelper.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx index 2f26b0c..dbeeb07 100644 --- a/Source/cmCommandArgumentParserHelper.cxx +++ b/Source/cmCommandArgumentParserHelper.cxx @@ -12,10 +12,10 @@ #include "cmCommandArgumentParserHelper.h" #include "cmSystemTools.h" -#include "cmCommandArgumentLexer.h" - #include "cmMakefile.h" +#include "cmCommandArgumentLexer.h" + int cmCommandArgument_yyparse( yyscan_t yyscanner ); // cmCommandArgumentParserHelper::cmCommandArgumentParserHelper() diff --git a/Source/cmExprParserHelper.cxx b/Source/cmExprParserHelper.cxx index 9c1795e..cc35f84 100644 --- a/Source/cmExprParserHelper.cxx +++ b/Source/cmExprParserHelper.cxx @@ -12,10 +12,10 @@ #include "cmExprParserHelper.h" #include "cmSystemTools.h" -#include "cmExprLexer.h" - #include "cmMakefile.h" +#include "cmExprLexer.h" + int cmExpr_yyparse( yyscan_t yyscanner ); // cmExprParserHelper::cmExprParserHelper() |