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

Compilation fixes for OS/2 (OS/2 still defines __UNIX__ :-( ).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2005-01-19 21:28:37 +00:00
parent 14bdf09396
commit e9737edeee
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/dynlib.cpp
View File

@@ -65,7 +65,7 @@ WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray);
#endif #endif
// for Unix it is in src/unix/dlunix.cpp // for Unix it is in src/unix/dlunix.cpp
#ifndef __UNIX__ #if !defined(__UNIX__) || defined(__EMX__)
wxDllType wxDynamicLibrary::GetProgramHandle() wxDllType wxDynamicLibrary::GetProgramHandle()
{ {
@@ -139,7 +139,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
// for MSW and Unix this is implemented in the platform-specific file // for MSW and Unix this is implemented in the platform-specific file
// //
// TODO: move the rest to os2/dlpm.cpp and mac/dlmac.cpp! // TODO: move the rest to os2/dlpm.cpp and mac/dlmac.cpp!
#if !defined(__WXMSW__) && !defined(__UNIX__) #if (!defined(__WXMSW__) && !defined(__UNIX__)) || defined(__EMX__)
/* static */ /* static */
void wxDynamicLibrary::Unload(wxDllType handle) void wxDynamicLibrary::Unload(wxDllType handle)
@@ -215,7 +215,7 @@ wxDynamicLibrary::CanonicalizeName(const wxString& name,
wxString nameCanonic; wxString nameCanonic;
// under Unix the library names usually start with "lib" prefix, add it // under Unix the library names usually start with "lib" prefix, add it
#ifdef __UNIX__ #if defined(__UNIX__) && !defined(__EMX__)
switch ( cat ) switch ( cat )
{ {
default: default:
@@ -263,7 +263,7 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
suffix = wxString(_T("_")) + suffix; suffix = wxString(_T("_")) + suffix;
#define WXSTRINGIZE(x) #x #define WXSTRINGIZE(x) #x
#ifdef __UNIX__ #if defined(__UNIX__) && !defined(__EMX__)
#if (wxMINOR_VERSION % 2) == 0 #if (wxMINOR_VERSION % 2) == 0
#define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y) #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y)
#else #else