X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df5168c427b51f1ab2b3200a5c8f7626b3d24aae..04857cb707be4de8083e599fc2e1967c77eb7f5e:/src/common/config.cpp diff --git a/src/common/config.cpp b/src/common/config.cpp index 24c66d9e90..9b5612a4b0 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -13,7 +13,7 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "confbase.h" #endif @@ -335,7 +335,11 @@ wxString wxExpandEnvVars(const wxString& str) wxString strVarName(str.c_str() + n + 1, m - n - 1); +#ifdef __WXWINCE__ + const wxChar *pszValue = NULL; +#else const wxChar *pszValue = wxGetenv(strVarName); +#endif if ( pszValue != NULL ) { strResult += pszValue; }