# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1230559652 0
# Node ID 0c410b5b387a7dc82a025a2fb386569a716ba59d
# Parent  7e01763ea6560a1ee82ba950ddd47bd62d769b8a# Parent  112f6ed4429915e2b374be688228895bbfcbc18a
Merge.

diff -r 7e01763ea656 -r 0c410b5b387a ChangeLog
--- a/ChangeLog	Sat Dec 27 16:02:25 2008 +0000
+++ b/ChangeLog	Mon Dec 29 14:07:32 2008 +0000
@@ -1,3 +1,13 @@
+2008-12-27  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* configure.ac: Vladimir Ivanovic's change of 2008-09-17 was
+	effective, but not correct. The original issue was that m4
+	stripped [], so "char *v[]" in configure.ac became "char *v" in
+	configure. His change to configure.ac rendered the declaration
+	"char **v[]", which is effective but confusing; this change
+	renders it "char **v".
+	* configure: Regenerate.
+
 2008-10-25  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* INSTALL: Give better pointers to package documentation.
@@ -6,6 +16,11 @@
 
 	* configure.ac (xemacs_cc_cc_mismatch): Improve g++ detection.
 
+2008-09-17  Vladimir G. Ivanovic  <vladimir@acm.org>
+
+	* configure:    Fixed two typos in args of main: char *v -> char **v
+	* configure.ac: Fixed two typos in args of main: char *v -> char **v
+
 2008-08-03  Mats Lidell  <matsl@xemacs.org>
 
 	* configure.ac: Fix typo xft_gauge to xft_gauges
diff -r 7e01763ea656 -r 0c410b5b387a configure
--- a/configure	Sat Dec 27 16:02:25 2008 +0000
+++ b/configure	Mon Dec 29 14:07:32 2008 +0000
@@ -19012,7 +19012,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <X11/Intrinsic.h>
-    int main(int c, char *v) { return c>1 ? XlibSpecificationRelease : 0; }
+    int main(int c, char **v) { return c>1 ? XlibSpecificationRelease : 0; }
 _ACEOF
 rm -f conftest$ac_exeext
 if { (ac_try="$ac_link"
@@ -38857,7 +38857,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-int main(int c,char *v){return 0;}
+int main(int c,char **v){return 0;}
 _ACEOF
 rm -f conftest$ac_exeext
 if { (ac_try="$ac_link"
diff -r 7e01763ea656 -r 0c410b5b387a configure.ac
--- a/configure.ac	Sat Dec 27 16:02:25 2008 +0000
+++ b/configure.ac	Mon Dec 29 14:07:32 2008 +0000
@@ -3434,7 +3434,7 @@
 
   AC_MSG_CHECKING(the version of X11 being used)
   AC_RUN_IFELSE([AC_LANG_SOURCE([#include <X11/Intrinsic.h>
-    int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }])],
+    int main(int c, char **v) { return c>1 ? XlibSpecificationRelease : 0; }])],
     [./conftest foobar; x11_release=$?],[x11_release=4],[x11_release=4])
   AC_MSG_RESULT(R${x11_release})
   AC_DEFINE_UNQUOTED(THIS_IS_X11R${x11_release})
@@ -5582,7 +5582,7 @@
 dnl One of the above link tests may have succeeded but caused resulting
 dnl executables to fail to run.  Also any tests using AC_RUN_IFELSE will
 dnl have reported incorrect results.
-AC_RUN_IFELSE([AC_LANG_SOURCE([int main(int c,char *v[]){return 0;}])],[:],[
+AC_RUN_IFELSE([AC_LANG_SOURCE([int main(int c,char **v){return 0;}])],[:],[
   echo ""
   echo "*** PANIC *** The C compiler can no longer build working executables."
   echo "*** PANIC *** Please examine the tail of config.log for runtime errors."
diff -r 7e01763ea656 -r 0c410b5b387a src/ChangeLog
--- a/src/ChangeLog	Sat Dec 27 16:02:25 2008 +0000
+++ b/src/ChangeLog	Mon Dec 29 14:07:32 2008 +0000
@@ -8,6 +8,11 @@
 	executed, but we may still want to check variable bindings; an
 	else clause isn't appropriate.
 
+2008-12-27  Vin Shelton  <acs@xemacs.org>
+
+	* syswindows.h: Don't define wide character interfaces for Cygwin
+	1.7 and up.
+
 2008-12-22  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* symbols.c (Fdefine_function): 
diff -r 7e01763ea656 -r 0c410b5b387a src/syswindows.h
--- a/src/syswindows.h	Sat Dec 27 16:02:25 2008 +0000
+++ b/src/syswindows.h	Mon Dec 29 14:07:32 2008 +0000
@@ -479,7 +479,7 @@
 #define BIF_NEWDIALOGSTYLE 64
 #endif
 
-#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/mingw/string.h! */