Compilation fix for OS/2 specific "Innotek gcc" port.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 3649f23a318af009300672888b5165a6f39a9ab0..af15a048aab31b65788c54be68489dc17c910686 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -2315,7 +2315,7 @@ typedef struct tagLOGPALETTE
     /*  VA 3.0 for some reason needs base data types when typedefing a proc proto??? */
 typedef void* (_System *WXFARPROC)(unsigned long, unsigned long, void*, void*);
 #else
     /*  VA 3.0 for some reason needs base data types when typedefing a proc proto??? */
 typedef void* (_System *WXFARPROC)(unsigned long, unsigned long, void*, void*);
 #else

-#ifdef __EMX__
+#if defined(__EMX__) && !defined(_System)

 #define _System
 #endif
 typedef WXRESULT (_System *WXFARPROC)(WXHWND, WXMSGID, WXWPARAM, WXLPARAM);
 #define _System
 #endif
 typedef WXRESULT (_System *WXFARPROC)(WXHWND, WXMSGID, WXWPARAM, WXLPARAM);