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

SN: Disable some features not supported by EMX (#ifndef __EMX__)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2000-01-14 22:51:34 +00:00
parent 7a0d28d8e9
commit 0629823585
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/os2/utils.cpp
View File

@@ -24,7 +24,11 @@
#include "wx/intl.h" #include "wx/intl.h"
#include <ctype.h> #include <ctype.h>
#ifdef __EMX__
#include <dirent.h>
#else
#include <direct.h> #include <direct.h>
#endif
#include "wx/log.h" #include "wx/log.h"
@@ -41,9 +45,11 @@
#define INCL_GPI #define INCL_GPI
#include <os2.h> #include <os2.h>
#define PURE_32 #define PURE_32
#ifndef __EMX__
#include <upm.h> #include <upm.h>
#include <netcons.h> #include <netcons.h>
#include <netbios.h> #include <netbios.h>
#endif
static const wxChar WX_SECTION[] = _T("wxWindows"); static const wxChar WX_SECTION[] = _T("wxWindows");
static const wxChar eHOSTNAME[] = _T("HostName"); static const wxChar eHOSTNAME[] = _T("HostName");
@@ -104,10 +110,12 @@ bool wxGetUserId(
, int nType , int nType
) )
{ {
#ifndef __EMX__
long lrc; long lrc;
// UPM procs return 0 on success // UPM procs return 0 on success
lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType); lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType);
if (lrc == 0) return TRUE; if (lrc == 0) return TRUE;
#endif
return FALSE; return FALSE;
} }
@@ -624,6 +632,7 @@ wxChar* wxGetUserHome (
wxString sUser1(rUser); wxString sUser1(rUser);
wxBuffer = new wxChar[256]; wxBuffer = new wxChar[256];
#ifndef __EMX__
if (sUser1 != _T("")) if (sUser1 != _T(""))
{ {
wxChar zTmp[64]; wxChar zTmp[64];
@@ -645,6 +654,7 @@ wxChar* wxGetUserHome (
sUser1 = _T(""); sUser1 = _T("");
} }
} }
#endif
if (sUser1 == _T("")) if (sUser1 == _T(""))
{ {
if ((zHome = wxGetenv(_T("HOME"))) != NULL) if ((zHome = wxGetenv(_T("HOME"))) != NULL)