X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9dea36ef6d117e0562f0079345a77ff1696d3a49..2fa7c206f68655f226e37ce1f1cc7e646e6c0bf2:/src/os2/utils.cpp diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp index a5dd628bad..34cb8a977f 100644 --- a/src/os2/utils.cpp +++ b/src/os2/utils.cpp @@ -24,7 +24,11 @@ #include "wx/intl.h" #include +#ifdef __EMX__ +#include +#else #include +#endif #include "wx/log.h" @@ -41,9 +45,11 @@ #define INCL_GPI #include #define PURE_32 +#ifndef __EMX__ #include #include #include +#endif static const wxChar WX_SECTION[] = _T("wxWindows"); static const wxChar eHOSTNAME[] = _T("HostName"); @@ -104,10 +110,12 @@ bool wxGetUserId( , int nType ) { +#ifndef __EMX__ long lrc; // UPM procs return 0 on success lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType); if (lrc == 0) return TRUE; +#endif return FALSE; } @@ -624,6 +632,7 @@ wxChar* wxGetUserHome ( wxString sUser1(rUser); wxBuffer = new wxChar[256]; +#ifndef __EMX__ if (sUser1 != _T("")) { wxChar zTmp[64]; @@ -645,6 +654,7 @@ wxChar* wxGetUserHome ( sUser1 = _T(""); } } +#endif if (sUser1 == _T("")) { if ((zHome = wxGetenv(_T("HOME"))) != NULL)