From mboxrd@z Thu Jan 1 00:00:00 1970 From: Syd Polk To: Ben Elliston , sourcenav@sources.redhat.com Subject: Re: Patches to db headers Date: Mon, 25 Sep 2000 14:24:00 -0000 Message-id: <4.2.0.58.20000925142602.00d2c9e0@pop.cygnus.com> References: <14799.45782.697197.982295@walkabout.cygnus.com> X-SW-Source: 2000-q3/msg00444.html Approved. I will add to the patches directory for 4.5.2 this week. At 04:17 PM 9/25/00 -0400, Ben Elliston wrote: >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 > > * 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 > Syd Polk spolk@redhat.com Engineering Manager +1 415 777 9810 x 241 Red Hat, Inc.