1. [gtk/simple_dialog.c]
The function definition must match the prototype or the IBM C
compiler errors out.
2. [acinclude.m4]
Don't assume u_int64_t exists. It doesn't on Solaris 2.5.1.
--
albert chin (china@xxxxxxxxxxxxxxxxxx)
--- snip snip
--- gtk/simple_dialog.c.orig 2004-07-12 23:26:21.188156000 -0500
+++ gtk/simple_dialog.c 2004-07-13 00:13:41.313442000 -0500
@@ -257,8 +257,13 @@
* ... : Argument list for msg_format
*/
+#if __GNUC__ >= 2
gpointer
vsimple_dialog(ESD_TYPE_E type, gint btn_mask, const gchar *msg_format, va_list ap)
+#else
+gpointer
+vsimple_dialog(gint type, gint btn_mask, const gchar *msg_format, va_list ap)
+#endif
{
gchar *vmessage;
gchar *message;
@@ -314,8 +319,13 @@
return win;
}
+#if __GNUC__ >= 2
gpointer
simple_dialog(ESD_TYPE_E type, gint btn_mask, const gchar *msg_format, ...)
+#else
+gpointer
+simple_dialog(gint type, gint btn_mask, const gchar *msg_format, ...)
+#endif
{
va_list ap;
gpointer ret;
--- acinclude.m4.orig Thu Jul 1 19:06:41 2004
+++ acinclude.m4 Tue Jul 13 10:01:46 2004
@@ -98,6 +93,16 @@
dnl
AC_DEFUN([AC_ETHEREAL_CHECK_64BIT_FORMAT],
[
+ AC_CHECK_TYPES(u_int64_t, ,
+ [
+ AC_DEFINE(u_int64_t, unsigned long long, [Type of unsigned long long])
+ ],
+ [
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+ ])
+
AC_MSG_CHECKING([whether %$1x can be used to format 64-bit integers])
AC_RUN_IFELSE(
[
