1 new commit in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/1003acd5a4b8/
changeset: 1003acd5a4b8
user: Vin Shelton
date: 2013-02-05 02:03:04
summary: Fix cygwin build on new win32api.
affected #: 2 files
diff -r 68f8d295be49fb1f37b708c368bb1b2b06dd75c9 -r
1003acd5a4b8bab74e3a465de40cdd0ccab9589b src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-04 Vin Shelton <acs(a)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(a)xemacs.org>
* general-slots.h: Add Q_visible.
diff -r 68f8d295be49fb1f37b708c368bb1b2b06dd75c9 -r
1003acd5a4b8bab74e3a465de40cdd0ccab9589b src/syswindows.h
--- a/src/syswindows.h
+++ b/src/syswindows.h
@@ -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
Repository URL:
https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from
bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches