APPROVE COMMIT 21.4
APPROVE COMMIT 21.5

On Sat, Dec 27, 2008 at 8:49 PM, Vin Shelton <acs@xemacs.org> wrote:

Under the new Cygwin 1.7, emacs.c gets a compilation error about
conflicting declarations of wcstok without this patch.  I will commit
this to both 21.4 and 21.5.

 - Vin


src/ChangeLog addition:

2008-12-27  Vin Shelton  <acs@xemacs.org>

       * syswindows.h: Don't define wide character interfaces for Cygwin
       1.7 and up.


21.4 source patch:
Diff command:   cvs -q diff -u
Files affected: src/syswindows.h

Index: src/syswindows.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/syswindows.h,v
retrieving revision 1.2.2.3
diff -a -u -u -r1.2.2.3 syswindows.h
--- src/syswindows.h    2002/08/20 11:38:17     1.2.2.3
+++ src/syswindows.h    2008/12/28 01:44:29
@@ -190,7 +190,7 @@

 #include <wchar.h>

-#ifdef CYGWIN
+#if defined (CYGWIN) && (CYGWIN_VERSION_DLL_COMBINED < 190)

 /* All but wcscmp and wcslen left out of Cygwin headers -- but present
   in /usr/include/mingw32/string.h! */

_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches@xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches