소스 검색

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.
Brad King 12 년 전
부모
커밋
ae6a5ea5a2
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      Source/cmCommandArgumentParserHelper.cxx
  2. 2 2
      Source/cmExprParserHelper.cxx

+ 2 - 2
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()

+ 2 - 2
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()