kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2013-08-07 10:14:58 -04:00
parent 7c9f0c664f
commit ae6a5ea5a2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmCommandArgumentParserHelper.cxx
View File

@ -12,10 +12,10 @@
#include "cmCommandArgumentParserHelper.h" #include "cmCommandArgumentParserHelper.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmCommandArgumentLexer.h"
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmCommandArgumentLexer.h"
int cmCommandArgument_yyparse( yyscan_t yyscanner ); int cmCommandArgument_yyparse( yyscan_t yyscanner );
// //
cmCommandArgumentParserHelper::cmCommandArgumentParserHelper() cmCommandArgumentParserHelper::cmCommandArgumentParserHelper()

4
Source/cmExprParserHelper.cxx
View File

@ -12,10 +12,10 @@
#include "cmExprParserHelper.h" #include "cmExprParserHelper.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmExprLexer.h"
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmExprLexer.h"
int cmExpr_yyparse( yyscan_t yyscanner ); int cmExpr_yyparse( yyscan_t yyscanner );
// //
cmExprParserHelper::cmExprParserHelper() cmExprParserHelper::cmExprParserHelper()