0026823: Configuration - use EGL on another platform without GLX

src/Standard/Standard.cxx

@@ -27,7 +27,7 @@
   #include <locale.h>
 #endif
 
-#if defined(_MSC_VER) || defined(__ANDROID__)
+#if defined(_MSC_VER) || defined(__ANDROID__) || defined(__QNX__)
   #include <malloc.h>
 #elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1)
   #include <mm_malloc.h>
@@ -264,7 +264,7 @@ Standard_Address Standard::AllocateAligned (const Standard_Size theSize,
 {
 #if defined(_MSC_VER)
   return _aligned_malloc (theSize, theAlign);
-#elif defined(__ANDROID__)
+#elif defined(__ANDROID__) || defined(__QNX__)
   return memalign (theAlign, theSize);
 #elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1)
   return _mm_malloc (theSize, theAlign);
@@ -287,7 +287,7 @@ void Standard::FreeAligned (Standard_Address thePtrAligned)
 {
 #if defined(_MSC_VER)
   _aligned_free (thePtrAligned);
-#elif defined(__ANDROID__)
+#elif defined(__ANDROID__) || defined(__QNX__)
   free (thePtrAligned);
 #elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1)
   _mm_free (thePtrAligned);

src/Standard/Standard_CString.cxx

@@ -80,7 +80,7 @@ Standard_Integer HashCodes (const Standard_CString Value,
     // glibc version for android platform use locale-independent implementation of
     // strtod, strtol, strtoll functions. For other system with locale-depended
     // implementations problems may appear if "C" locale is not set explicitly.
-    #ifndef __ANDROID__
+    #if !defined(__ANDROID__) && !defined(__QNX__)
       #error System does not support xlocale. Import/export could be broken if C locale did not specified by application.
     #endif
     #define strtod_l(thePtr, theNextPtr, theLocale)              strtod(thePtr, theNextPtr)

src/Standard/Standard_MMgrOpt.cxx

@@ -18,6 +18,7 @@
 #include <Standard_Assert.hxx>
 
 #include <stdio.h>
+#include <errno.h>
 
 #ifdef _WIN32
 # include <windows.h>

src/Standard/Standard_Mutex.cxx

@@ -24,6 +24,8 @@
 #include <Standard_Mutex.hxx>
 #include <Standard_OStream.hxx>
 
+#include <errno.h>
+
 //=============================================
 // Standard_Mutex::Standard_Mutex
 //=============================================

src/Standard/Standard_Mutex.hxx

@@ -20,11 +20,11 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_ErrorHandlerCallback.hxx>
 
-#if (defined(_WIN32) || defined(__WIN32__))
+#if defined(_WIN32)
   #include <windows.h>
 #else
   #include <pthread.h>
-  #include <sys/errno.h>
+  ///#include <sys/errno.h>
   #include <unistd.h>
   #include <time.h>
 #endif

src/Standard/Standard_Real.cxx

@@ -239,8 +239,12 @@ Standard_Real     ATanh(const Standard_Real Value)
 #ifdef OCCT_DEBUG
     cout << "Illegal agument in ATanh" << endl ;
 #endif
-  } 
-  return atanh(Value); 
+  }
+#if __cplusplus >= 201103L
+  return std::atanh(Value);
+#else
+  return atanh(Value);
+#endif
 }
 
 //-------------------------------------------------------------------
@@ -253,8 +257,12 @@ Standard_Real     ACosh (const Standard_Real Value)
 #ifdef OCCT_DEBUG
     cout << "Illegal agument in ACosh" << endl ;
 #endif
-  } 
-  return acosh(Value); 
+  }
+#if __cplusplus >= 201103L
+  return std::acosh(Value);
+#else
+  return acosh(Value);
+#endif
 }
 
 //-------------------------------------------------------------------

src/Standard/Standard_Real.hxx

@@ -15,8 +15,8 @@
 #ifndef _Standard_Real_HeaderFile
 #define _Standard_Real_HeaderFile
 
+#include <cmath>
 #include <float.h>
-#include <math.h>
 #include <Standard_values.h>
 #include <Standard_math.hxx>
 #include <Standard_TypeDef.hxx>
@@ -295,7 +295,11 @@ inline Standard_Real     Sinh(const Standard_Real Value)
 // ASinh : Returns the hyperbolic arc sine of a real
 //-------------------------------------------------------------------
 inline Standard_Real     ASinh(const Standard_Real Value) 
+#if __cplusplus >= 201103L
+{ return std::asinh(Value); }
+#else
 { return asinh(Value); }
+#endif
 
 //-------------------------------------------------------------------
 // Square : Returns a real to the power 2

src/Standard/Standard_ShortReal.hxx

@@ -15,8 +15,8 @@
 #ifndef _Standard_ShortReal_HeaderFile
 #define _Standard_ShortReal_HeaderFile
 
+#include <cmath>
 #include <float.h>
-#include <math.h>
 
 #include <Standard_values.h>
 #include <Standard_TypeDef.hxx>

src/Standard/Standard_Time.hxx

@@ -21,6 +21,8 @@
 //    - IsEqual
 // ===============================================
 
+#ifndef __QNX__ // same as Standard_Size
+
 // ------------------------------------------------------------------
 // IsEqual : Returns Standard_True if two time values are equal
 // ------------------------------------------------------------------
@@ -31,3 +33,5 @@ inline Standard_Boolean IsEqual (const Standard_Time theOne,
 }
 
 #endif
+
+#endif