diff options
| -rw-r--r-- | src/render/mgldefines.h | 2 | ||||
| -rw-r--r-- | src/utils/files.cpp | 2 | ||||
| -rw-r--r-- | src/utils/process.cpp | 22 |
3 files changed, 18 insertions, 8 deletions
diff --git a/src/render/mgldefines.h b/src/render/mgldefines.h index 1af8acbba..4f765e2a4 100644 --- a/src/render/mgldefines.h +++ b/src/render/mgldefines.h @@ -23,11 +23,13 @@ #ifdef USE_OPENGL +#ifndef GL_NUM_EXTENSIONS #define GL_NUM_EXTENSIONS 0x821D #define GL_DEPTH_ATTACHMENT 0x8D00 #define GL_COLOR_ATTACHMENT0 0x8CE0 #define GL_FRAMEBUFFER 0x8D40 #define GL_RENDERBUFFER 0x8D41 +#endif #ifndef GL_COMPRESSED_RGBA_ARB #define GL_COMPRESSED_RGBA_ARB 0x84EE diff --git a/src/utils/files.cpp b/src/utils/files.cpp index 726f33225..f3155757c 100644 --- a/src/utils/files.cpp +++ b/src/utils/files.cpp @@ -74,7 +74,9 @@ void Files::extractLocale() namespace { +#ifdef ANDROID int mFilesCount = 0; +#endif Files::CopyFileCallbackPtr mCallbackPtr = nullptr; } // namespace diff --git a/src/utils/process.cpp b/src/utils/process.cpp index d680cb453..6da177eb9 100644 --- a/src/utils/process.cpp +++ b/src/utils/process.cpp @@ -32,7 +32,9 @@ #include "debug.h" +#ifndef __native_client__ const int timeOut = 10; +#endif #ifdef WIN32 @@ -216,15 +218,19 @@ bool execFile(const std::string &pathName, const std::string &name, #else -int execFileWait(const std::string &pathName, const std::string &name, - const std::string &arg1, const std::string &arg2, - int waitTime) +int execFileWait(const std::string &pathName A_UNUSED, + const std::string &name A_UNUSED, + const std::string &arg1 A_UNUSED, + const std::string &arg2 A_UNUSED, + int waitTime A_UNUSED) { return -1; } -bool execFile(const std::string &pathName, const std::string &name, - const std::string &arg1, const std::string &arg2) +bool execFile(const std::string &pathName A_UNUSED, + const std::string &name A_UNUSED, + const std::string &arg1 A_UNUSED, + const std::string &arg2 A_UNUSED) { return false; } @@ -320,9 +326,9 @@ void naclPostMessage(const std::string &type, const std::string &message) pp::Instance(PSGetInstanceId()).PostMessage(msgVar); } -void naclMessageHandlerFunc(struct PP_Var key, - struct PP_Var value, - void* user_data) +static void naclMessageHandlerFunc(struct PP_Var key, + struct PP_Var value, + void* user_data) { NaclMessageHandle *handle = (NaclMessageHandle *)user_data; |