Mercurial > hg > xemacs-beta
changeset 1453:908cd1ff6104
[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>.
| author | youngs |
|---|---|
| date | Sun, 04 May 2003 00:02:48 +0000 |
| parents | dd63b61df78c |
| children | 38d0f093d818 |
| files | src/ChangeLog src/database.c |
| diffstat | 2 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 */