Cygwin patch for 21.5.24
Hi
The following patch is needed to compile under cygwin.
xemacs-21.5.24/ChangeLog
2005-12-20 Dr. Volker Zell <Dr.Volker.Zell(a)oracle.com>
* configure.ac: Avoid using Motif also for cygwin.
* configure.ac: Check for u_int*_t typedefs and use them in
Berkeley DB detection.
diff -urN -x .build -x .inst -x .sinst xemacs-21.5.24-orig/configure.ac
xemacs-21.5.24/configure.ac
--- xemacs-21.5.24-orig/configure.ac 2005-12-18 18:58:55.000000000 +0100
+++ xemacs-21.5.24/configure.ac 2005-12-20 13:01:25.079643200 +0100
＠＠ -4272,7 +4272,7 ＠＠
dnl Avoid using Motif :-(
case "$opsys" in
- *linux* | *darwin* | *bsd* ) lucid_prefers_motif="no" ;;
+ *linux* | *darwin* | *bsd* | cygwin* ) lucid_prefers_motif="no" ;;
* ) lucid_prefers_motif="yes" ;;
esac
＠＠ -5293,6 +5293,9 ＠＠
"$enable_database_dbm" = "yes" && \
AC_DEFINE(HAVE_DBM)
+dnl Check for u_int*_t typedefs.
+AC_CHECK_TYPES([u_int8_t, u_int16_t, u_int32_t, u_int64_t])
+
dnl Check for Berkeley DB.
if test "$enable_database_berkdb" != "no"; then
AC_MSG_CHECKING(for Berkeley db.h)
＠＠ -5303,14 +5306,22 ＠＠
#ifdef HAVE_INTTYPES_H
#define __BIT_TYPES_DEFINED__
#include <inttypes.h>
+#if !HAVE_U_INT8_T
typedef uint8_t u_int8_t;
+#endif
+#if !HAVE_U_INT16_T
typedef uint16_t u_int16_t;
+#endif
+#if !HAVE_U_INT32_T
typedef uint32_t u_int32_t;
+#endif
#ifdef WE_DONT_NEED_QUADS
+#if !HAVE_U_INT64_T
typedef uint64_t u_int64_t;
#endif
#endif
#endif
+#endif
#include <$header>
],[], db_h_file="$header"; break)
done
xemacs-21.5.24/src/ChangeLog
2005-12-20 Dr. Volker Zell <Dr.Volker.Zell(a)oracle.com>
* config.h.in: New HAVE_U_INT*_T defines.
* database.c: Only use u_int*_t typedefs if not already
defined.
* database.c: Suppress compiler warning under Cygwin.
Only use __BIT_TYPES_DEFINED__ if not already defined.
* event-msw.c (reinit_vars_of_event_mswindows): Declare
dde_eval_pending as static int.
diff -urN -x .build -x .inst -x .sinst xemacs-21.5.24-orig/src/config.h.in
xemacs-21.5.24/src/config.h.in
--- xemacs-21.5.24-orig/src/config.h.in 2005-11-26 12:46:07.000000000 +0100
+++ xemacs-21.5.24/src/config.h.in 2005-12-20 13:01:25.279931200 +0100
＠＠ -520,6 +520,15 ＠＠
/* Compile in support for DBM databases? May require libgdbm or libdbm. */
#undef HAVE_DBM
+/* Define to 1 if the system has the type `u_int8_t'. */
+#undef HAVE_U_INT8_T
+/* Define to 1 if the system has the type `u_int16_t'. */
+#undef HAVE_U_INT16_T
+/* Define to 1 if the system has the type `u_int32_t'. */
+#undef HAVE_U_INT32_T
+/* Define to 1 if the system has the type `u_int64_t'. */
+#undef HAVE_U_INT64_T
+
/* Compile in support for Berkeley DB style databases? May require libdb. */
#undef HAVE_BERKELEY_DB
/* Full #include file path for Berkeley DB's db.h */
diff -urN -x .build -x .inst -x .sinst xemacs-21.5.24-orig/src/database.c
xemacs-21.5.24/src/database.c
--- xemacs-21.5.24-orig/src/database.c 2005-11-16 08:22:46.000000000 +0100
+++ xemacs-21.5.24/src/database.c 2005-12-20 13:01:25.309974400 +0100
＠＠ -45,16 +45,24 ＠＠
/* 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>
-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__APPLE__)
+#if !HAVE_U_INT8_T
typedef uint8_t u_int8_t;
+#endif
+#if !HAVE_U_INT16_T
typedef uint16_t u_int16_t;
+#endif
+#if !HAVE_U_INT32_T
typedef uint32_t u_int32_t;
+#endif
#ifdef WE_DONT_NEED_QUADS
+#if !HAVE_U_INT64_T
typedef uint64_t u_int64_t;
+#endif
#endif /* WE_DONT_NEED_QUADS */
-#endif /* __FreeBSD__ */
#endif /* HAVE_INTTYPES_H */
#endif /* !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) */
/* Berkeley DB wants __STDC__ to be defined; else if does `#define const' */
diff -urN -x .build -x .inst -x .sinst xemacs-21.5.24-orig/src/event-msw.c
xemacs-21.5.24/src/event-msw.c
--- xemacs-21.5.24-orig/src/event-msw.c 2005-11-25 02:42:01.000000000 +0100
+++ xemacs-21.5.24/src/event-msw.c 2005-12-20 13:01:25.340017600 +0100
＠＠ -5037,6 +5037,7 ＠＠
mswindows_event_stream->current_event_timestamp_cb =
emacs_mswindows_current_event_timestamp;
+ static int dde_eval_pending;
dde_eval_pending = 0;
}
Ciao
Volker