X-Recipient:	archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status:	No, hits=-2.0 required=5.0 tests=BAYES_00,SARE_MSGID_LONG40,SPF_PASS
X-Spam-Check-By:	sourceware.org
MIME-Version:	1.0
Date:	Wed, 24 Jun 2009 12:14:05 +0200
Message-ID:	<6910a60906240314h5d59012fu6c3abc625cf3fabd@mail.gmail.com>
Subject:	Cygwin-1.7 support
From:	Reini Urban <rurban AT x-ray DOT at>
To:	xemacs-patches AT xemacs DOT org
Cc:	The Cygwin Mailing List <cygwin AT cygwin DOT com>
X-IsSubscribed:	yes
Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id:	<cygwin.cygwin.com>
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sourceware.org/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com

Cygwin 1.7 comes with wchar.h (finally) so we need this patch.
(inlined)

Tested okay.


diff -u xemacs-21.5.28/src/syswindows.h.orig xemacs-21.5.28/src/syswindows.h
--- xemacs-21.5.28/src/syswindows.h.orig	2006-12-08 03:22:02.000000000 +0100
+++ xemacs-21.5.28/src/syswindows.h	2009-06-24 12:01:06.546875000 +0200
@@ -481,7 +481,10 @@

 #ifdef CYGWIN

-/* All but wcscmp and wcslen left out of Cygwin headers -- but present
+#if (CYGWIN_VERSION_API_MINOR >= 181)
+#  include <wchar.h>
+#else
+/* All but wcscmp and wcslen left out of Cygwin 1.5 headers -- but present
    in /usr/include/mingw/string.h! */
 wchar_t* wcscat (wchar_t*, const wchar_t*);
 wchar_t* wcschr (const wchar_t*, wchar_t);
@@ -499,6 +502,7 @@
 wchar_t* wcsstr (const wchar_t*, const wchar_t*);
 wchar_t* wcstok (wchar_t*, const wchar_t*);
 size_t	wcsxfrm (wchar_t*, const wchar_t*, size_t);
+#endif /* CYGWIN 1.5 */

 #endif /* CYGWIN */

-- 
Reini Urban
http://phpwiki.org/              http://murbreak.at/

--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple

- Raw text -