0024444: Compilation issues on some not fully POSIX compliant Unix systems

- Standard package. - OSD package. - Aspect package. - Xw package.
2025-04-04 18:06:22 +03:00 · 2014-08-14 13:42:50 +04:00 · 2014-08-14 13:42:50 +04:00 · 0304f71151
commit 0304f71151
parent 72b11796c5
11 changed files with 62 additions and 26 deletions
--- a/src/Aspect/Aspect_DisplayConnection.cxx
+++ b/src/Aspect/Aspect_DisplayConnection.cxx
@ -25,7 +25,7 @@ IMPLEMENT_STANDARD_RTTIEXT(Aspect_DisplayConnection, Standard_Transient)
 // =======================================================================
 Aspect_DisplayConnection::Aspect_DisplayConnection()
 {
-#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX))
+#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__)
  OSD_Environment anEnv ("DISPLAY");
  myDisplayName = anEnv.Value();
  Init();
@ -38,7 +38,7 @@ Aspect_DisplayConnection::Aspect_DisplayConnection()
 // =======================================================================
 Aspect_DisplayConnection::~Aspect_DisplayConnection()
 {
-#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX))
+#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__)
  if (myDisplay != NULL)
  {
    XCloseDisplay (myDisplay);
@ -46,7 +46,7 @@ Aspect_DisplayConnection::~Aspect_DisplayConnection()
 #endif
 }

-#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX))
+#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__)
 // =======================================================================
 // function : Aspect_DisplayConnection
 // purpose  :
--- a/src/Aspect/Aspect_DisplayConnection.hxx
+++ b/src/Aspect/Aspect_DisplayConnection.hxx
@ -21,7 +21,7 @@
 #include <TCollection_AsciiString.hxx>
 #include <NCollection_DataMap.hxx>

-#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX))
+#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__)
  #include <X11/Xlib.h>
 #endif

@ -40,7 +40,7 @@ public:
  //! Destructor. Close opened connection.
  Standard_EXPORT ~Aspect_DisplayConnection();

-#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX))
+#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__)
  //! Constructor. Creates connection with display specified in theDisplayName.
  //! Display name should be in format "hostname:number" or "hostname:number.screen_number", where:
  //! hostname      - Specifies the name of the host machine on which the display is physically attached.
--- a/src/Aspect/Aspect_XWD.hxx
+++ b/src/Aspect/Aspect_XWD.hxx
@ -14,7 +14,7 @@
 #ifndef __Aspect_WNTXWD_HXX
 # define __Aspect_WNTXWD_HXX

-#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX))
+#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__)
 #  include <X11/XWDFile.h>
 # else

--- a/src/OSD/OSD_FileNode.cxx
+++ b/src/OSD/OSD_FileNode.cxx
@ -371,9 +371,9 @@ Quantity_Date  OSD_FileNode::CreationMoment(){
 TCollection_AsciiString aBuffer;
 myPath.SystemName ( aBuffer );
 if (!stat ( aBuffer.ToCString(), &buffer )) {
-   decode = localtime(&buffer.st_ctime);
-   result.SetValues ( 
-		     decode->tm_mon+1, decode->tm_mday, decode->tm_year+1900,
+   time_t aTime = (time_t)buffer.st_ctime;
+   decode = localtime (&aTime);
+   result.SetValues (decode->tm_mon+1, decode->tm_mday, decode->tm_year+1900,
 		     decode->tm_hour, decode->tm_min, decode->tm_sec , 0,0);
 }
 else
@ -399,9 +399,9 @@ Quantity_Date  OSD_FileNode::AccessMoment(){
 TCollection_AsciiString aBuffer;
 myPath.SystemName ( aBuffer );
 if (!stat ( aBuffer.ToCString(), &buffer )) {
-   decode = localtime(&buffer.st_atime);
-   result.SetValues (
-		     decode->tm_mon+1, decode->tm_mday, decode->tm_year+1900,
+   time_t aTime = (time_t)buffer.st_ctime;
+   decode = localtime (&aTime);
+   result.SetValues (decode->tm_mon+1, decode->tm_mday, decode->tm_year+1900,
 		     decode->tm_hour, decode->tm_min, decode->tm_sec, 0,0 );
 }
 else
--- a/src/OSD/OSD_signal.cxx
+++ b/src/OSD/OSD_signal.cxx
@ -53,7 +53,6 @@ static pthread_t getOCCThread () {

 #ifdef linux
 #include <fenv.h>
-#include <fpu_control.h>
 static Standard_Boolean fFltExceptions = Standard_False;
 #endif

--- a/src/Standard/Standard.cxx
+++ b/src/Standard/Standard.cxx
@ -28,7 +28,7 @@
  #include <locale.h>
 #endif

-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__ANDROID__)
  #include <malloc.h>
 #elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1)
  #include <mm_malloc.h>
@ -231,8 +231,10 @@ Standard_Address Standard::AllocateAligned (const Standard_Size theSize,
 {
 #if defined(_MSC_VER)
  return _aligned_malloc (theSize, theAlign);
+#elif defined(__ANDROID__)
+  return memalign (theAlign, theSize);
 #elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1)
-  return      _mm_malloc (theSize, theAlign);
+  return _mm_malloc (theSize, theAlign);
 #else
  void* aPtr;
  if (posix_memalign (&aPtr, theAlign, theSize))
@ -252,6 +254,8 @@ void Standard::FreeAligned (Standard_Address thePtrAligned)
 {
 #if defined(_MSC_VER)
  _aligned_free (thePtrAligned);
+#elif defined(__ANDROID__)
+  free (thePtrAligned);
 #elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1)
  _mm_free (thePtrAligned);
 #else
--- a/src/Standard/Standard_Atomic.hxx
+++ b/src/Standard/Standard_Atomic.hxx
@ -27,6 +27,10 @@
 #ifndef _Standard_Atomic_HeaderFile
 #define _Standard_Atomic_HeaderFile

+#if defined(__ANDROID__)
+  #include <sys/atomics.h>
+#endif
+
 //! Increments atomically integer variable pointed by theValue
 //! and returns resulting incremented value.
 inline int Standard_Atomic_Increment (volatile int* theValue);
@ -95,6 +99,23 @@ int Standard_Atomic_Decrement (volatile int* theValue)
  return OSAtomicDecrement32Barrier (theValue);
 }

+#elif defined(__ANDROID__)
+// Atomic operations that were exported by the C library didn't
+// provide any memory barriers, which created potential issues on
+// multi-core devices. Starting from ndk version r7b they are defined as
+// inlined calls to GCC sync builtins, which always provide a full barrier.
+// It is strongly recommended to use newer versions of ndk.
+
+int Standard_Atomic_Increment (volatile int* theValue)
+{
+  return __atomic_inc (theValue);
+}
+
+int Standard_Atomic_Decrement (volatile int* theValue)
+{
+  return __atomic_dec (theValue);
+}
+
 #elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64))
 // use x86 / x86_64 inline assembly (compatibility with alien compilers / old GCC)

--- a/src/Standard/Standard_CLocaleSentry.hxx
+++ b/src/Standard/Standard_CLocaleSentry.hxx
@ -20,16 +20,23 @@

 #include <locale.h>

-//! "xlocale.h" available in Mac OS X and glibc (Linux) for a long time as an extension
-//! and become part of POSIX since '2008.
-//! Notice that this is impossible to test (_POSIX_C_SOURCE >= 200809L)
-//! since POSIX didn't declared such identifier.
-//! We check _GNU_SOURCE for glibc extensions here and it is always defined by g++ compiler.
-#if defined(__APPLE__) || defined(_GNU_SOURCE) || defined(HAVE_XLOCALE_H)
-  #include <xlocale.h>
-  #ifndef HAVE_XLOCALE_H
+#ifndef HAVE_XLOCALE_H
+  //! "xlocale.h" available in Mac OS X and glibc (Linux) for a long time as an extension
+  //! and become part of POSIX since '2008.
+  //! Notice that this is impossible to test (_POSIX_C_SOURCE >= 200809L)
+  //! since POSIX didn't declared such identifier.
+  #if defined(__APPLE__)
    #define HAVE_XLOCALE_H
  #endif
+
+  //! We check _GNU_SOURCE for glibc extensions here and it is always defined by g++ compiler.
+  #if defined(_GNU_SOURCE) && !defined(__ANDROID__)
+    #define HAVE_XLOCALE_H
+  #endif
+#endif // ifndef HAVE_LOCALE_H
+
+#ifdef HAVE_XLOCALE_H
+  #include <xlocale.h>
 #endif

 //! This class intended to temporary switch C locale and logically equivalent to setlocale(LC_ALL, "C").
--- a/src/Standard/Standard_CString.cxx
+++ b/src/Standard/Standard_CString.cxx
@ -77,7 +77,12 @@ Standard_Integer HashCodes (const Standard_CString Value,
  // So we switch to C locale temporarily
  #define SAVE_TL() Standard_CLocaleSentry aLocaleSentry;
  #ifndef HAVE_XLOCALE_H
-    #error System does not support xlocale. Import/export could be broken if C locale did not specified by application.
+    // 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__
+      #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)
  #endif
  #define vprintf_l(theLocale, theFormat, theArgPtr)             vprintf(theFormat, theArgPtr)
--- a/src/Xw/Xw_Window.cxx
+++ b/src/Xw/Xw_Window.cxx
@ -15,7 +15,7 @@

 #include <Xw_Window.hxx>

-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX))
+#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__)

 #include <Aspect_Convert.hxx>
 #include <Aspect_WindowDefinitionError.hxx>
--- a/src/Xw/Xw_Window.hxx
+++ b/src/Xw/Xw_Window.hxx
@ -16,7 +16,7 @@
 #ifndef _Xw_Window_H__
 #define _Xw_Window_H__

-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX))
+#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__)

 #include <Aspect_Window.hxx>