FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Standardized on defined(__ANDROID__)

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14556 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-11-28 10:54:40 +00:00
parent 6d98c5460f
commit d7c6bb1c4b
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/BufferObject
View File

@@ -40,7 +40,7 @@
#if defined(_WIN64) #if defined(_WIN64)
typedef __int64 GLintptr; typedef __int64 GLintptr;
typedef __int64 GLsizeiptr; 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 GLintptr;
typedef long int GLsizeiptr; typedef long int GLsizeiptr;
#else #else

2
include/osgDB/ConvertUTF
View File

@@ -19,7 +19,7 @@
#include <string> #include <string>
#if defined(__CYGWIN__) || defined(ANDROID) #if defined(__CYGWIN__) || defined(__ANDROID__)
namespace std namespace std
{ {
typedef basic_string<wchar_t> wstring; typedef basic_string<wchar_t> wstring;

4
src/OpenThreads/pthreads/PThread.cpp
View File

@@ -46,7 +46,7 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
#if defined(ANDROID) #if defined(__ANDROID__)
#ifndef PAGE_SIZE #ifndef PAGE_SIZE
#define PAGE_SIZE 0x400 #define PAGE_SIZE 0x400
#endif #endif
@@ -996,7 +996,7 @@ int Thread::YieldCurrentThread()
// //
int Thread::microSleep(unsigned int microsec) int Thread::microSleep(unsigned int microsec)
{ {
#if !defined(ANDROID) #if !defined(__ANDROID__)
return ::usleep(microsec); return ::usleep(microsec);
#else #else
::usleep(microsec); ::usleep(microsec);

2
src/osg/GLExtensions.cpp
View File

@@ -319,7 +319,7 @@ OSG_INIT_SINGLETON_PROXY(GLExtensionDisableStringInitializationProxy, osg::getGL
void* osg::getGLExtensionFuncPtr(const char *funcName) void* osg::getGLExtensionFuncPtr(const char *funcName)
{ {
// OSG_NOTICE<<"osg::getGLExtensionFuncPtr("<<funcName<<")"<<std::endl; // OSG_NOTICE<<"osg::getGLExtensionFuncPtr("<<funcName<<")"<<std::endl;
#if defined(ANDROID) #if defined(__ANDROID__)
#if defined(OSG_GLES1_AVAILABLE) #if defined(OSG_GLES1_AVAILABLE)
static void *handle = dlopen("libGLESv1_CM.so", RTLD_NOW); static void *handle = dlopen("libGLESv1_CM.so", RTLD_NOW);
#elif defined(OSG_GLES2_AVAILABLE) #elif defined(OSG_GLES2_AVAILABLE)