>>>> Ben Wing writes:
Dr. Volker Zell wrote:
> src/ChangeLog
>
> 2005-12-05 Dr. Volker Zell <Dr.Volker.Zell(a)oracle.com>
>
> * database.c: Suppress compiler warning under Cygwin.
>
> diff -urN -x .build -x .inst -x .sinst xemacs-21.4.18-orig/src/database.c
xemacs-21.4.18/src/database.c
> --- xemacs-21.4.18-orig/src/database.c 2005-11-25 03:01:57.000000000 +0100
> +++ xemacs-21.4.18/src/database.c 2005-12-07 23:04:59.774696000 +0100
> @@ -43,7 +43,9 @@
> /* glibc 2.1 doesn't have this problem with DB 2.x */
> #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
> #ifdef HAVE_INTTYPES_H
> +#ifndef __CYGWIN__
> #define __BIT_TYPES_DEFINED__
> +#endif
> #include <inttypes.h>
> #ifndef __FreeBSD__
> #if !HAVE_U_INT8_T
>
>
>
this should probably be
#ifndef __BIT_TYPES_DEFINED__
...
Yep
* database.c: Suppress compiler warning under Cygwin.
* database.c: Removed __FreeBSD__ check, should be handled by
HAVE_U_xxx_T defines.
diff -urN -x .build -x .inst -x .sinst xemacs-21.4.18-orig/src/database.c
xemacs-21.4.18/src/database.c
--- xemacs-21.4.18-orig/src/database.c 2005-11-25 03:01:57.000000000 +0100
+++ xemacs-21.4.18/src/database.c 2005-12-17 12:05:22.791323200 +0100
@@ -43,9 +43,10 @@
/* glibc 2.1 doesn't have this problem with DB 2.x */
#if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
#ifdef HAVE_INTTYPES_H
+#ifndef __BIT_TYPES_DEFINED__
#define __BIT_TYPES_DEFINED__
+#endif
#include <inttypes.h>
-#ifndef __FreeBSD__
#if !HAVE_U_INT8_T
typedef uint8_t u_int8_t;
#endif
@@ -60,7 +61,6 @@
typedef uint64_t u_int64_t;
#endif
#endif /* WE_DONT_NEED_QUADS */
-#endif /* !defined(__FreeBSD__) */
#endif /* HAVE_INTTYPES_H */
#endif /* !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) */
/* Berkeley DB wants __STDC__ to be defined; else if does `#define const' */