0025963: Define HashCode() for an unsigned int within armv7 target

OSD_EnvironmentIterator - do not use _NSGetEnviron() on iOS.

diff --git a/src/OSD/OSD_EnvironmentIterator.cxx b/src/OSD/OSD_EnvironmentIterator.cxx
index fd5d3461724af77ac2cd7fa620acacd31075482f..68e3d169e498d7b49f542efcb061ce01463cb199 100644 (file)
--- a/src/OSD/OSD_EnvironmentIterator.cxx
+++ b/src/OSD/OSD_EnvironmentIterator.cxx
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#ifndef WNT
+#ifndef _WIN32
 
 //---------- All Systems except windowsNT : ----------------------------------
 
@@ -21,10 +21,14 @@
 
 //const OSD_WhoAmI Iam = OSD_WEnvironmentIterator;
 #ifdef __APPLE__
-#include <crt_externs.h>
-#define environ (*_NSGetEnviron())
+  #if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+    #include <crt_externs.h>
+    #define environ (*_NSGetEnviron())
+  #else
+    extern char **environ;
+  #endif
 #else
-extern char **environ;
+  extern char **environ;
 #endif
 
 OSD_EnvironmentIterator::OSD_EnvironmentIterator(){

diff --git a/src/Standard/Standard_Integer.hxx b/src/Standard/Standard_Integer.hxx
index 2207840523c3c000cf74f24b632c838bef042def..674e1b3ca9645a96aeabb471aac06e9e6bd9f2c5 100755 (executable)
--- a/src/Standard/Standard_Integer.hxx
+++ b/src/Standard/Standard_Integer.hxx
@@ -49,7 +49,7 @@ inline Standard_Boolean IsEqual (const Standard_Integer theOne,
   return theOne == theTwo;
 }
 
-#if (defined(_LP64) || defined(__LP64__) || defined(_WIN64))
+#if (defined(_LP64) || defined(__LP64__) || defined(_WIN64)) || defined(__APPLE__)
 // ------------------------------------------------------------------
 // Hascode : Computes a hascoding value for a given unsigned integer
 // ------------------------------------------------------------------