Fix Android build.

Change-Id: If37158efec1555a3b4e14774dff081f284292245
Reviewed-on: https://swiftshader-review.googlesource.com/15308
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

diff --git a/src/OpenGL/compiler/Android.mk b/src/OpenGL/compiler/Android.mk
index 95b3018..867f70a 100644 (file)
--- a/src/OpenGL/compiler/Android.mk
+++ b/src/OpenGL/compiler/Android.mk
@@ -37,8 +37,8 @@ COMMON_CFLAGS += -D__STDC_INT64__
 endif
 
 COMMON_SRC_FILES := \
-       preprocessor/Diagnostics.cpp \
-       preprocessor/DirectiveHandler.cpp \
+       preprocessor/DiagnosticsBase.cpp \
+       preprocessor/DirectiveHandlerBase.cpp \
        preprocessor/DirectiveParser.cpp \
        preprocessor/ExpressionParser.cpp \
        preprocessor/Input.cpp \

diff --git a/src/OpenGL/compiler/preprocessor/MacroExpander.cpp b/src/OpenGL/compiler/preprocessor/MacroExpander.cpp
index 9be3d46..a235112 100644 (file)
--- a/src/OpenGL/compiler/preprocessor/MacroExpander.cpp
+++ b/src/OpenGL/compiler/preprocessor/MacroExpander.cpp
@@ -69,7 +69,7 @@ class MacroExpander::ScopedMacroReenabler final
        ~ScopedMacroReenabler();
 
   private:
-       PP_DISALLOW_COPY_AND_ASSIGN(MacroExpander::ScopedMacroReenabler);
+       PP_DISALLOW_COPY_AND_ASSIGN(ScopedMacroReenabler);
 
        MacroExpander *mExpander;
 };

diff --git a/src/OpenGL/compiler/preprocessor/Preprocessor.h b/src/OpenGL/compiler/preprocessor/Preprocessor.h
index 8fdb2f6..a8e139c 100644 (file)
--- a/src/OpenGL/compiler/preprocessor/Preprocessor.h
+++ b/src/OpenGL/compiler/preprocessor/Preprocessor.h
@@ -17,6 +17,8 @@
 
 #include "pp_utils.h"
 
+#include <cstddef>
+
 namespace pp
 {
 

diff --git a/src/OpenGL/compiler/preprocessor/numeric_lex.h b/src/OpenGL/compiler/preprocessor/numeric_lex.h
index 64faa26..ed22e03 100644 (file)
--- a/src/OpenGL/compiler/preprocessor/numeric_lex.h
+++ b/src/OpenGL/compiler/preprocessor/numeric_lex.h
@@ -18,6 +18,7 @@
 #define COMPILER_PREPROCESSOR_NUMERIC_LEX_H_
 
 #include <sstream>
+#include <cmath>
 
 namespace pp {