From edb31724bcbba7bec4a66bb998340ac1ae848779 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 4 Dec 2010 13:34:19 +0000 Subject: [PATCH] fixing osx iphone build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/utilscmn.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 837e2c2239..246d94f22c 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -549,8 +549,10 @@ wxString wxGetCurrentDir() // ---------------------------------------------------------------------------- #ifdef __WXOSX__ +#if wxOSX_USE_COCOA_OR_CARBON #include #endif +#endif bool wxGetEnvMap(wxEnvVariableHashMap *map) { @@ -563,6 +565,7 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map) // TODO : should we do something with logicals? char **env=NULL; #elif defined(__WXOSX__) +#if wxOSX_USE_COCOA_OR_CARBON // Under Mac shared libraries don't have access to the global environ // variable so use this Mac-specific function instead as advised by // environ(7) under Darwin @@ -570,6 +573,10 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map) if ( !penv ) return false; char **env = *penv; +#else + char **env=NULL; + // todo translate NSProcessInfo environment into map +#endif #else // non-MSVC non-Mac // Not sure if other compilers have _tenviron so use the (more standard) // ANSI version only for them.