Standardized on defined(__ANDROID__)

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14556 16af8721-9629-0410-8352-f15c8da7e697

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);

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)