# HG changeset patch
# User stephent
# Date 1051856703 0
# Node ID d9d4999d5f5cb96b19edffa35c2ac38d4eca37fb
# Parent  4f98e7b44323e667d6d86244ef6ace1e6a7bc49b
[xemacs-hg @ 2003-05-02 06:25:02 by stephent]
cygwin configure hax <87znm5uasy.fsf@tleepslib.sk.tsukuba.ac.jp>

diff -r 4f98e7b44323 -r d9d4999d5f5c src/ChangeLog
--- a/src/ChangeLog	Fri May 02 06:16:42 2003 +0000
+++ b/src/ChangeLog	Fri May 02 06:25:03 2003 +0000
@@ -1,3 +1,8 @@
+2003-05-02  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* config.h.in (HAVE_INTPTR_T_IN_SYS_TYPES_H): New.
+	lisp.h (intptr_t): Use it.
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.
diff -r 4f98e7b44323 -r d9d4999d5f5c src/config.h.in
--- a/src/config.h.in	Fri May 02 06:16:42 2003 +0000
+++ b/src/config.h.in	Fri May 02 06:25:03 2003 +0000
@@ -892,6 +892,11 @@
 #undef SIZEOF_LONG_LONG
 #undef SIZEOF_VOID_P
 
+/* some systems (Cygwin) typedef u?intptr_t in <sys/types.h>
+   but the standard is <inttypes.h>
+   ugliness due to last-resort conditional typedef'ing in lisp.h */
+#undef HAVE_INTPTR_T_IN_SYS_TYPES_H
+
 /* Does the keyword `inline' exist?  */
 #undef inline
 
diff -r 4f98e7b44323 -r d9d4999d5f5c src/lisp.h
--- a/src/lisp.h	Fri May 02 06:16:42 2003 +0000
+++ b/src/lisp.h	Fri May 02 06:25:03 2003 +0000
@@ -797,6 +797,8 @@
 
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
+#elif defined(HAVE_INTPTR_T_IN_SYS_TYPES_H)
+/* included elsewhere */
 #elif SIZEOF_VOID_P == SIZEOF_INT
 typedef int intptr_t;
 typedef unsigned int uintptr_t;