changeset 2262:09e68196904a

[xemacs-hg @ 2004-09-11 04:00:33 by james] Conditionalize Cygwin bug workaround on w32api header version.
author james
date Sat, 11 Sep 2004 04:00:41 +0000
parents 7ffd8096e327
children 702b5727498a
files src/ChangeLog src/intl-encap-win32.c
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri Sep 10 21:50:39 2004 +0000
+++ b/src/ChangeLog	Sat Sep 11 04:00:41 2004 +0000
@@ -1,3 +1,8 @@
+2004-09-10  Jerry James  <james@xemacs.org>
+
+	* intl-encap-win32.c (qxeDocumentProperties): Conditionalize
+	Cygwin bug workaround on w32api header version.
+
 2004-08-18  Felix H. Gatzemeier  <f.g@tzemeier.info>
 
 	* alloc.c (malloced_storage_size): Renamed log to log2, twice,
--- a/src/intl-encap-win32.c	Fri Sep 10 21:50:39 2004 +0000
+++ b/src/intl-encap-win32.c	Sat Sep 11 04:00:41 2004 +0000
@@ -1795,8 +1795,8 @@
 		       DWORD fMode)
 {
   if (XEUNICODE_P)
-#ifdef CYGWIN_HEADERS
-    /* Cygwin mistakenly declares the fourth and fifth arguments as
+#if defined (CYGWIN_HEADERS) && W32API_INSTALLED_VER < W32API_VER(3,1)
+    /* Cygwin used to mistakenly declare the fourth and fifth arguments as
        PDEVMODEA. */
     return DocumentPropertiesW (hWnd, hPrinter, (LPWSTR) pDeviceName,
 				(DEVMODEA *) pDevModeOutput,