Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing osx iphone build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2010-12-04 13:34:19 +00:00
parent 0ef18b97a3
commit edb31724bc
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/utilscmn.cpp
View File

@@ -549,8 +549,10 @@ wxString wxGetCurrentDir()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef __WXOSX__ #ifdef __WXOSX__
#if wxOSX_USE_COCOA_OR_CARBON
#include <crt_externs.h> #include <crt_externs.h>
#endif #endif
#endif
bool wxGetEnvMap(wxEnvVariableHashMap *map) bool wxGetEnvMap(wxEnvVariableHashMap *map)
{ {
@@ -563,6 +565,7 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map)
// TODO : should we do something with logicals? // TODO : should we do something with logicals?
char **env=NULL; char **env=NULL;
#elif defined(__WXOSX__) #elif defined(__WXOSX__)
#if wxOSX_USE_COCOA_OR_CARBON
// Under Mac shared libraries don't have access to the global environ // Under Mac shared libraries don't have access to the global environ
// variable so use this Mac-specific function instead as advised by // variable so use this Mac-specific function instead as advised by
// environ(7) under Darwin // environ(7) under Darwin
@@ -570,6 +573,10 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map)
if ( !penv ) if ( !penv )
return false; return false;
char **env = *penv; char **env = *penv;
#else
char **env=NULL;
// todo translate NSProcessInfo environment into map
#endif
#else // non-MSVC non-Mac #else // non-MSVC non-Mac
// Not sure if other compilers have _tenviron so use the (more standard) // Not sure if other compilers have _tenviron so use the (more standard)
// ANSI version only for them. // ANSI version only for them.