From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ben Elliston <bje@redhat.com>
To: sourcenav@sources.redhat.com
Subject: Patches to db headers
Date: Mon, 25 Sep 2000 13:12:00 -0000
Message-id: <14799.45782.697197.982295@walkabout.cygnus.com>
X-SW-Source: 2000-q3/msg00442.html

The following patches are for the db/ subdirectory (Berkeley DB).
They are very minor, but overcome macro naming collisions brought
about by Cygnus adding Automakefiles to the db/ tree.  These patches
allay many warnings during compilation.

Ben


2000-09-25  Ben Elliston  <bje@redhat.com>

	* hash/hash.h (VERSION): Undefine Automake's VERSION.
	* PORT/include/compat.h (BYTE_ORDER): Undefine prior to
          defining.

Index: hash/hash.h
===================================================================
RCS file: /cvs/cvsfiles/devo/db/hash/hash.h,v
retrieving revision 1.4
diff -u -r1.4 hash.h
--- hash.h	1997/06/02 21:15:10	1.4
+++ hash.h	2000/09/25 17:01:59
@@ -289,6 +289,7 @@
 #define HDRPAGES	hdr.hdrpages
 #define SPARES		hdr.spares
 #define BITMAPS		hdr.bitmaps
+#undef VERSION
 #define VERSION		hdr.version
 #define MAGIC		hdr.magic
 #define NEXT_FREE	hdr.next_free

Index: PORT/include/compat.h
===================================================================
RCS file: /cvs/cvsfiles/devo/db/PORT/include/compat.h,v
retrieving revision 1.3
diff -u -r1.3 compat.h
--- compat.h	1997/02/01 00:21:09	1.3
+++ compat.h	2000/09/25 17:01:57
@@ -102,6 +102,7 @@
 #define	BIG_ENDIAN	4321		/* MSB first: 68000, ibm, net */
 #endif
 
+#undef BYTE_ORDER
 #ifdef WORDS_BIGENDIAN
 #define	BYTE_ORDER	BIG_ENDIAN
 #else