Mercurial > hg > xemacs-beta
changeset 5716:1003acd5a4b8
Fix cygwin build on new win32api.
| author | Vin Shelton <acs@xemacs.org> |
|---|---|
| date | Mon, 04 Feb 2013 20:03:04 -0500 |
| parents | 68f8d295be49 |
| children | 1fd684db4d45 |
| files | src/ChangeLog src/syswindows.h |
| diffstat | 2 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jan 23 11:48:46 2013 -0700 +++ b/src/ChangeLog Mon Feb 04 20:03:04 2013 -0500 @@ -1,3 +1,8 @@ +2013-02-04 Vin Shelton <acs@xemacs.org> + + * syswindows.h: Fix the cygwin build by supporting win32api 3.14 + through appropriate guard macros. Thanks to Mats Lidell. + 2013-01-22 Jerry James <james@xemacs.org> * general-slots.h: Add Q_visible.
--- a/src/syswindows.h Wed Jan 23 11:48:46 2013 -0700 +++ b/src/syswindows.h Mon Feb 04 20:03:04 2013 -0500 @@ -443,6 +443,7 @@ #endif /* not NMCBEDRAGBEGIN */ +#if W32API_INSTALLED_VER < W32API_VER(3,14) typedef struct tagNMDATETIMEFORMATA { NMHDR nmhdr; @@ -460,6 +461,7 @@ LPCWSTR pszDisplay; WCHAR szDisplay[64]; } NMDATETIMEFORMATW, FAR * LPNMDATETIMEFORMATW; +#endif #if W32API_INSTALLED_VER < W32API_VER(2,2) @@ -555,6 +557,7 @@ #define OIC_WINLOGO 32517 #endif +#if W32API_INSTALLED_VER < W32API_VER(3,14) /* More Cygwin stupidity: Current w32api's winuser.h has IME message constants and they conflict with imm.h. (NOTE: Currently fixed, but I'm sure the problems were present post 1.0.) */ @@ -570,6 +573,7 @@ #undef WM_IME_CHAR #undef WM_IME_KEYDOWN #undef WM_IME_KEYUP +#endif #include <imm.h> @@ -585,6 +589,10 @@ typedef LPCDLGTEMPLATE LPCDLGTEMPLATEW; typedef LPCDLGTEMPLATE LPCDLGTEMPLATEA; +#if W32API_VER(3,14) <= W32API_INSTALLED_VER +typedef LPCVOID PCVOID; +#endif + #else /* !CYGWIN_HEADERS */ #define W32API_VER(major,minor) 0