APPROVE COMMIT 21.5
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.884
diff -u -U0 -r1.884 ChangeLog
--- ChangeLog 13 Nov 2005 10:48:01 -0000 1.884
+++ ChangeLog 16 Nov 2005 05:36:39 -0000
@@ -0,0 +1,4 @@
+2005-11-16 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * database.c: Don't redefine integer types for Mac OS X, either.
+
Index: src/database.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/database.c,v
retrieving revision 1.37
diff -u -r1.37 database.c
--- src/database.c 25 Oct 2005 11:16:22 -0000 1.37
+++ src/database.c 16 Nov 2005 04:24:10 -0000
@@ -47,7 +47,7 @@
#ifdef HAVE_INTTYPES_H
#define __BIT_TYPES_DEFINED__
#include <inttypes.h>
-#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__APPLE__)
typedef uint8_t u_int8_t;
typedef uint16_t u_int16_t;
typedef uint32_t u_int32_t;
--
Graduate School of Systems and Information Engineering University of Tsukuba
http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Economics of Information Communication and Computation Systems
Experimental Economics, Microeconomic Theory, Game Theory