# HG changeset patch
# User youngs
# Date 1052006568 0
# Node ID 908cd1ff6104d8b2f315b2824c57947f92e8dbc2
# Parent  dd63b61df78c59ba68997da7e74db32fbda8fe26
[xemacs-hg @ 2003-05-04 00:02:45 by youngs]
2003-05-04  Robert Pluim  <rpluim@bigfoot.com>

	* database.c: Don't use the u_int8_t etc typedefs on FreeBSD,
	  they conflict with <sys/types.h>.

diff -r dd63b61df78c -r 908cd1ff6104 src/ChangeLog
--- a/src/ChangeLog	Sat May 03 22:47:15 2003 +0000
+++ b/src/ChangeLog	Sun May 04 00:02:48 2003 +0000
@@ -1,3 +1,8 @@
+2003-05-04  Robert Pluim  <rpluim@bigfoot.com>
+
+	* database.c: Don't use the u_int8_t etc typedefs on FreeBSD,
+	  they conflict with <sys/types.h>.
+
 2003-05-02  Andrew Begel  <abegel@CS.Berkeley.EDU>
 
 	* lrecord.h: Added casts from int to enum lrecord_type to support
diff -r dd63b61df78c -r 908cd1ff6104 src/database.c
--- a/src/database.c	Sat May 03 22:47:15 2003 +0000
+++ b/src/database.c	Sun May 04 00:02:48 2003 +0000
@@ -47,12 +47,14 @@
 #ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__
 #include <inttypes.h>
+#ifndef __FreeBSD__
 typedef uint8_t  u_int8_t;
 typedef uint16_t u_int16_t;
 typedef uint32_t u_int32_t;
 #ifdef WE_DONT_NEED_QUADS
 typedef uint64_t u_int64_t;
 #endif /* WE_DONT_NEED_QUADS */
+#endif /* __FreeBSD__ */
 #endif /* HAVE_INTTYPES_H */
 #endif /* !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) */
 #include DB_H_FILE              /* Berkeley db's header file */