OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-07 18:30:55 +03:00
Code Packages Releases Activity

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

Browse Source 
OSD_EnvironmentIterator - do not use _NSGetEnviron() on iOS.
This commit is contained in:
kgv 2015-03-23 18:37:41 +03:00 committed by apn
parent a3ac9c24ce
commit d44e14e3f6
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/OSD/OSD_EnvironmentIterator.cxx
View File

@ -12,7 +12,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#ifndef WNT #ifndef _WIN32
//---------- All Systems except windowsNT : ---------------------------------- //---------- All Systems except windowsNT : ----------------------------------
@ -21,11 +21,15 @@
//const OSD_WhoAmI Iam = OSD_WEnvironmentIterator; //const OSD_WhoAmI Iam = OSD_WEnvironmentIterator;
#ifdef __APPLE__ #ifdef __APPLE__
#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
#include <crt_externs.h> #include <crt_externs.h>
#define environ (*_NSGetEnviron()) #define environ (*_NSGetEnviron())
#else #else
extern char **environ; extern char **environ;
#endif #endif
#else
extern char **environ;
#endif
OSD_EnvironmentIterator::OSD_EnvironmentIterator(){ OSD_EnvironmentIterator::OSD_EnvironmentIterator(){
myCount = 0; myCount = 0;

2
src/Standard/Standard_Integer.hxx
View File

@ -49,7 +49,7 @@ inline Standard_Boolean IsEqual (const Standard_Integer theOne,
return theOne == theTwo; 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 // Hascode : Computes a hascoding value for a given unsigned integer
// ------------------------------------------------------------------ // ------------------------------------------------------------------