Fixed compilation problems with gcc on OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
84dd58ce98
commit
0fe5619d25
@ -1783,8 +1783,15 @@ typedef int (__stdcall *WXFARPROC)();
|
|||||||
|
|
||||||
|
|
||||||
#if defined(__WXPM__)
|
#if defined(__WXPM__)
|
||||||
|
#ifdef __EMX__
|
||||||
|
/* Need a well-known type for WXFARPROC
|
||||||
|
below. MPARAM is typedef'ed too late. */
|
||||||
|
#define WXWPARAM void *
|
||||||
|
#define WXLPARAM void *
|
||||||
|
#else
|
||||||
#define WXWPARAM MPARAM
|
#define WXWPARAM MPARAM
|
||||||
#define WXLPARAM MPARAM
|
#define WXLPARAM MPARAM
|
||||||
|
#endif
|
||||||
#define RECT RECTL
|
#define RECT RECTL
|
||||||
#define LOGFONT FATTRS
|
#define LOGFONT FATTRS
|
||||||
#define LOWORD SHORT1FROMMP
|
#define LOWORD SHORT1FROMMP
|
||||||
@ -1842,6 +1849,9 @@ typedef struct tagLOGPALETTE
|
|||||||
// VA 3.0 for some reason needs base data types when typedefing a proc proto???
|
// 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*);
|
typedef void* (_System *WXFARPROC)(unsigned long, unsigned long, void*, void*);
|
||||||
#else
|
#else
|
||||||
|
#ifdef __EMX__
|
||||||
|
#define _System
|
||||||
|
#endif
|
||||||
typedef WXRESULT (_System *WXFARPROC)(WXHWND, WXMSGID, WXWPARAM, WXLPARAM);
|
typedef WXRESULT (_System *WXFARPROC)(WXHWND, WXMSGID, WXWPARAM, WXLPARAM);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user