From d7c6bb1c4b5efc7e3c4b63617a9d2420ff970dce Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 28 Nov 2014 10:54:40 +0000
Subject: [PATCH] Standardized on defined(__ANDROID__)

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14556 16af8721-9629-0410-8352-f15c8da7e697
---
 include/osg/BufferObject             | 2 +-
 include/osgDB/ConvertUTF             | 2 +-
 src/OpenThreads/pthreads/PThread.cpp | 4 ++--
 src/osg/GLExtensions.cpp             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/osg/BufferObject b/include/osg/BufferObject
index cdb668a93..14b0c4443 100644
--- a/include/osg/BufferObject
+++ b/include/osg/BufferObject
@@ -40,7 +40,7 @@
     #if defined(_WIN64)
         typedef __int64 GLintptr;
         typedef __int64 GLsizeiptr;
-    #elif defined(__ia64__) || defined(__x86_64__) || defined(ANDROID)
+    #elif defined(__ia64__) || defined(__x86_64__) || defined(__ANDROID__)
         typedef long int GLintptr;
         typedef long int GLsizeiptr;
     #else
diff --git a/include/osgDB/ConvertUTF b/include/osgDB/ConvertUTF
index 90f87bb2a..fa20f3a3a 100644
--- a/include/osgDB/ConvertUTF
+++ b/include/osgDB/ConvertUTF
@@ -19,7 +19,7 @@
 
 #include <string>
 
-#if defined(__CYGWIN__) || defined(ANDROID)
+#if defined(__CYGWIN__) || defined(__ANDROID__)
 namespace std
 {
 typedef basic_string<wchar_t> wstring;
diff --git a/src/OpenThreads/pthreads/PThread.cpp b/src/OpenThreads/pthreads/PThread.cpp
index 66e97c96a..4dd32c986 100644
--- a/src/OpenThreads/pthreads/PThread.cpp
+++ b/src/OpenThreads/pthreads/PThread.cpp
@@ -46,7 +46,7 @@
     #include <sys/sysctl.h>
 #endif
 
-#if defined(ANDROID)
+#if defined(__ANDROID__)
     #ifndef PAGE_SIZE
         #define PAGE_SIZE 0x400
     #endif
@@ -996,7 +996,7 @@ int Thread::YieldCurrentThread()
 //
 int Thread::microSleep(unsigned int microsec)
 {
-#if !defined(ANDROID)
+#if !defined(__ANDROID__)
     return ::usleep(microsec);
 #else
     ::usleep(microsec);
diff --git a/src/osg/GLExtensions.cpp b/src/osg/GLExtensions.cpp
index 01630cc5f..660286f2f 100644
--- a/src/osg/GLExtensions.cpp
+++ b/src/osg/GLExtensions.cpp
@@ -319,7 +319,7 @@ OSG_INIT_SINGLETON_PROXY(GLExtensionDisableStringInitializationProxy, osg::getGL
     void* osg::getGLExtensionFuncPtr(const char *funcName)
     {
         // OSG_NOTICE<<"osg::getGLExtensionFuncPtr("<<funcName<<")"<<std::endl;
-    #if defined(ANDROID)
+    #if defined(__ANDROID__)
         #if defined(OSG_GLES1_AVAILABLE)
             static void *handle = dlopen("libGLESv1_CM.so", RTLD_NOW);
         #elif defined(OSG_GLES2_AVAILABLE)