2003-06-29 Miloslav Trmac <mitr@volny.cz>

	* dbus/dbus-mainloop.c (_dbus_loop_remove_watch)
	(_dbus_loop_remove_timeout): Cast function pointers to (void *) for %p

	* configure.in: Add -D_POSIX_C_SOURCE=199309L -DBSD_SOURCE to CFLAGS
	and disable DBUS_USE_ATOMIC_INT_486 when --enable-ansi is used

diff --git a/ChangeLog b/ChangeLog
index 00b421e0e0be88e886efc9cf6e81fb239164eff7..dd87a635ab6a35f03f5f92861ed8a005bff9713a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-29  Miloslav Trmac  <mitr@volny.cz>
+
+       * dbus/dbus-mainloop.c (_dbus_loop_remove_watch)
+       (_dbus_loop_remove_timeout): Cast function pointers to (void *) for %p
+
+       * configure.in: Add -D_POSIX_C_SOURCE=199309L -DBSD_SOURCE to CFLAGS
+       and disable DBUS_USE_ATOMIC_INT_486 when --enable-ansi is used
+
 2003-06-24  Havoc Pennington  <hp@pobox.com>
 
        * mono/*.cs: Use IntPtr.Zero instead of ((IntPtr) 0)

diff --git a/configure.in b/configure.in
index 5d699faa39cea6e3d29def14bfc10cf73f0a7c5a..f8e69caf54b2b85bbd935a8d5a3ff3c006f0d634 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -109,6 +109,16 @@ if test "x$GCC" = "xyes"; then
     *) CFLAGS="$CFLAGS -ansi" ;;
     esac
 
+    case " $CFLAGS " in
+    *[\ \      ]-D_POSIX_C_SOURCE*) ;;
+    *) CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=199309L" ;;
+    esac
+
+    case " $CFLAGS " in
+    *[\ \      ]-D_BSD_SOURCE[\ \      ]*) ;;
+    *) CFLAGS="$CFLAGS -D_BSD_SOURCE" ;;
+    esac
+
     case " $CFLAGS " in
     *[\ \      ]-pedantic[\ \  ]*) ;;
     *) CFLAGS="$CFLAGS -pedantic" ;;
@@ -272,19 +282,23 @@ AC_C_BIGENDIAN
 AC_MSG_CHECKING([whether to use inline assembler routines for atomic integers])
 have_atomic_inc=no
 if test x"$GCC" = xyes; then
-  case $host_cpu in
-    i386)
-      AC_MSG_RESULT([no])
-      ;;
-    i?86)
-      AC_MSG_RESULT([i486])
-      AC_DEFINE_UNQUOTED(DBUS_USE_ATOMIC_INT_486, 1, [Use atomic integer implementation for 486])
-      have_atomic_inc=yes
-      ;;
-    *)
-      AC_MSG_RESULT([no])
-      ;;
-  esac
+  if test "x$enable_ansi" = "xyes"; then
+    AC_MSG_RESULT([no])
+  else
+    case $host_cpu in
+      i386)
+        AC_MSG_RESULT([no])
+        ;;
+      i?86)
+        AC_MSG_RESULT([i486])
+        AC_DEFINE_UNQUOTED(DBUS_USE_ATOMIC_INT_486, 1, [Use atomic integer implementation for 486])
+        have_atomic_inc=yes
+        ;;
+      *)
+        AC_MSG_RESULT([no])
+        ;;
+    esac
+  fi
 fi
 if test x$have_atomic_inc = xyes ; then
   AC_DEFINE_UNQUOTED(DBUS_HAVE_ATOMIC_INT, 1, [Some atomic integer implementation present])

diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c
index 04c8f1de4a4fd80c60097851d2a97eca79fbfe4e..51eb7b0df2d946ebbe95250a3d55e9de96eb5293 100644 (file)
--- a/dbus/dbus-mainloop.c
+++ b/dbus/dbus-mainloop.c
@@ -282,7 +282,7 @@ _dbus_loop_remove_watch (DBusLoop          *loop,
     }
 
   _dbus_warn ("could not find watch %p function %p data %p to remove\n",
-              watch, function, data);
+              watch, (void *)function, data);
 }
 
 dbus_bool_t
@@ -336,7 +336,7 @@ _dbus_loop_remove_timeout (DBusLoop            *loop,
     }
 
   _dbus_warn ("could not find timeout %p function %p data %p to remove\n",
-              timeout, function, data);
+              timeout, (void *)function, data);
 }
 
 /* Convolutions from GLib, there really must be a better way