D-BUS doesn't build with --enable-ansi
Miloslav Trmac
mitr@volny.cz
Sat, 28 Jun 2003 04:59:10 +0200
--gKMricLos+KVdGMg
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hello,
D-BUS currently doesn't build with --enable-ansi. The first attached
patch (patch-ansi-main) fixes that, by avoiding gcc-specific
DBUS_USE_ATOMIC_INT and defining feature set macros so that
needed symbols are declared in libc (glibc at least) headers.
It also corrects passing function pointer where a data pointer is
expected. This would cause problems on machines where these two
pointer sizes are different (IA-64 IIRC). I'm not sure what the result
of the added cast is on such machines, but at worst, it would
resuilt in a build failure instead of silent undefined behavior, which
is happening now.
The second patch just removes many warning in the build process;
ISO C doesn't allow empty declarations, and
DBUS_BEGIN_DECLS;
expands to just ";".
Mirek
--gKMricLos+KVdGMg
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-ansi-main
diff -ur dbus-ansi/configure.in dbus/configure.in
--- dbus-ansi/configure.in 2003-06-28 03:47:24.000000000 +0200
+++ dbus/configure.in 2003-06-28 04:22:42.000000000 +0200
@@ -110,6 +110,16 @@
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" ;;
esac
@@ -272,19 +282,23 @@
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 -ur dbus-ansi/dbus/dbus-mainloop.c dbus/dbus/dbus-mainloop.c
--- dbus-ansi/dbus/dbus-mainloop.c 2003-06-28 03:47:24.000000000 +0200
+++ dbus/dbus/dbus-mainloop.c 2003-06-28 04:29:46.000000000 +0200
@@ -282,7 +282,7 @@
}
_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_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
--gKMricLos+KVdGMg
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-ansi-decls
diff -ur dbus/dbus/dbus-arch-deps.h.in sw/dbus/dbus/dbus-arch-deps.h.in
--- dbus/dbus/dbus-arch-deps.h.in 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-arch-deps.h.in 2003-06-28 03:46:36.000000000 +0200
@@ -30,7 +30,7 @@
#include <dbus/dbus-types.h>
#include <dbus/dbus-macros.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
#if @DBUS_HAVE_INT64@
#define DBUS_HAVE_INT64 1
@@ -46,6 +46,6 @@
#undef DBUS_UINT64_CONSTANT
#endif
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_ARCH_DEPS_H */
diff -ur dbus/dbus/dbus-auth.h sw/dbus/dbus/dbus-auth.h
--- dbus/dbus/dbus-auth.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-auth.h 2003-06-28 03:46:36.000000000 +0200
@@ -28,7 +28,7 @@
#include <dbus/dbus-string.h>
#include <dbus/dbus-sysdeps.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusAuth DBusAuth;
@@ -77,6 +77,6 @@
const DBusString *context);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_AUTH_H */
diff -ur dbus/dbus/dbus-auth-script.h sw/dbus/dbus/dbus-auth-script.h
--- dbus/dbus/dbus-auth-script.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-auth-script.h 2003-06-28 03:46:36.000000000 +0200
@@ -30,10 +30,10 @@
#include <dbus/dbus-types.h>
#include <dbus/dbus-string.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
dbus_bool_t _dbus_auth_script_run (const DBusString *filename);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_AUTH_SCRIPT_H */
diff -ur dbus/dbus/dbus-bus.h sw/dbus/dbus/dbus-bus.h
--- dbus/dbus/dbus-bus.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-bus.h 2003-06-28 03:46:36.000000000 +0200
@@ -29,7 +29,7 @@
#include <dbus/dbus-connection.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef enum
{
@@ -59,6 +59,6 @@
dbus_uint32_t *reply,
DBusError *error);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_BUS_H */
diff -ur dbus/dbus/dbus-connection.h sw/dbus/dbus/dbus-connection.h
--- dbus/dbus/dbus-connection.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-connection.h 2003-06-28 03:46:36.000000000 +0200
@@ -31,7 +31,7 @@
#include <dbus/dbus-message.h>
#include <dbus/dbus-memory.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusConnection DBusConnection;
typedef struct DBusWatch DBusWatch;
@@ -200,6 +200,6 @@
dbus_uint32_t *client_serial);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_CONNECTION_H */
diff -ur dbus/dbus/dbus-connection-internal.h sw/dbus/dbus/dbus-connection-internal.h
--- dbus/dbus/dbus-connection-internal.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-connection-internal.h 2003-06-28 03:46:36.000000000 +0200
@@ -30,7 +30,7 @@
#include <dbus/dbus-resources.h>
#include <dbus/dbus-list.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef enum
{
@@ -82,6 +82,6 @@
DBusConnection *connection,
DBusMessage *message);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_CONNECTION_INTERNAL_H */
diff -ur dbus/dbus/dbus-dataslot.h sw/dbus/dbus/dbus-dataslot.h
--- dbus/dbus/dbus-dataslot.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-dataslot.h 2003-06-28 03:46:36.000000000 +0200
@@ -25,7 +25,7 @@
#include <dbus/dbus-internals.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusDataSlotAllocator DBusDataSlotAllocator;
typedef struct DBusDataSlotList DBusDataSlotList;
@@ -80,6 +80,6 @@
void _dbus_data_slot_list_free (DBusDataSlotList *list);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_DATASLOT_H */
diff -ur dbus/dbus/dbus-errors.h sw/dbus/dbus/dbus-errors.h
--- dbus/dbus/dbus-errors.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-errors.h 2003-06-28 03:46:36.000000000 +0200
@@ -31,7 +31,7 @@
#include <dbus/dbus-macros.h>
#include <dbus/dbus-types.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusError DBusError;
@@ -90,6 +90,6 @@
const char *name);
dbus_bool_t dbus_error_is_set (const DBusError *error);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_ERROR_H */
diff -ur dbus/dbus/dbus-hash.h sw/dbus/dbus/dbus-hash.h
--- dbus/dbus/dbus-hash.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-hash.h 2003-06-28 03:46:36.000000000 +0200
@@ -27,7 +27,7 @@
#include <dbus/dbus-memory.h>
#include <dbus/dbus-types.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
/* The iterator is on the stack, but its real fields are
* hidden privately.
@@ -120,6 +120,6 @@
void *value);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_HASH_H */
diff -ur dbus/dbus/dbus-internals.h sw/dbus/dbus/dbus-internals.h
--- dbus/dbus/dbus-internals.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-internals.h 2003-06-28 03:46:36.000000000 +0200
@@ -35,7 +35,7 @@
#include <dbus/dbus-sysdeps.h>
#include <dbus/dbus-threads.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
void _dbus_warn (const char *format,
...) _DBUS_GNUC_PRINTF (1, 2);
@@ -239,6 +239,6 @@
dbus_bool_t _dbus_threads_init_debug (void);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_INTERNALS_H */
diff -ur dbus/dbus/dbus-keyring.h sw/dbus/dbus/dbus-keyring.h
--- dbus/dbus/dbus-keyring.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-keyring.h 2003-06-28 03:46:36.000000000 +0200
@@ -27,7 +27,7 @@
#include <dbus/dbus-errors.h>
#include <dbus/dbus-string.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusKeyring DBusKeyring;
@@ -45,6 +45,6 @@
int key_id,
DBusString *hex_key);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_KEYRING_H */
diff -ur dbus/dbus/dbus-list.h sw/dbus/dbus/dbus-list.h
--- dbus/dbus/dbus-list.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-list.h 2003-06-28 03:46:36.000000000 +0200
@@ -28,7 +28,7 @@
#include <dbus/dbus-memory.h>
#include <dbus/dbus-types.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusList DBusList;
@@ -94,6 +94,6 @@
#define _dbus_list_get_next_link(list, link) ((link)->next == *(list) ? NULL : (link)->next)
#define _dbus_list_get_prev_link(list, link) ((link) == *(list) ? NULL : (link)->prev)
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_LIST_H */
diff -ur dbus/dbus/dbus-md5.h sw/dbus/dbus/dbus-md5.h
--- dbus/dbus/dbus-md5.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-md5.h 2003-06-28 03:46:36.000000000 +0200
@@ -27,7 +27,7 @@
#include <dbus/dbus-errors.h>
#include <dbus/dbus-string.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusMD5Context DBusMD5Context;
@@ -46,6 +46,6 @@
dbus_bool_t _dbus_md5_compute (const DBusString *data,
DBusString *ascii_output);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_MD5_H */
diff -ur dbus/dbus/dbus-memory.h sw/dbus/dbus/dbus-memory.h
--- dbus/dbus/dbus-memory.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-memory.h 2003-06-28 03:46:36.000000000 +0200
@@ -30,7 +30,7 @@
#include <dbus/dbus-macros.h>
#include <stddef.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
void* dbus_malloc (size_t bytes);
void* dbus_malloc0 (size_t bytes);
@@ -47,6 +47,6 @@
void dbus_shutdown (void);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_MEMORY_H */
diff -ur dbus/dbus/dbus-mempool.h sw/dbus/dbus/dbus-mempool.h
--- dbus/dbus/dbus-mempool.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-mempool.h 2003-06-28 03:46:36.000000000 +0200
@@ -28,7 +28,7 @@
#include <dbus/dbus-memory.h>
#include <dbus/dbus-types.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusMemPool DBusMemPool;
@@ -39,6 +39,6 @@
dbus_bool_t _dbus_mem_pool_dealloc (DBusMemPool *pool,
void *element);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_MEMPOOL_H */
diff -ur dbus/dbus/dbus-message-builder.h sw/dbus/dbus/dbus-message-builder.h
--- dbus/dbus/dbus-message-builder.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-message-builder.h 2003-06-28 03:46:36.000000000 +0200
@@ -30,11 +30,11 @@
#include <dbus/dbus-types.h>
#include <dbus/dbus-string.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
dbus_bool_t _dbus_message_data_load (DBusString *dest,
const DBusString *filename);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_MESSAGE_BUILDER_H */
diff -ur dbus/dbus/dbus-message.h sw/dbus/dbus/dbus-message.h
--- dbus/dbus/dbus-message.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-message.h 2003-06-28 03:46:36.000000000 +0200
@@ -33,7 +33,7 @@
#include <dbus/dbus-memory.h>
#include <stdarg.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusMessage DBusMessage;
typedef struct DBusMessageIter DBusMessageIter;
@@ -242,6 +242,6 @@
void* dbus_message_get_data (DBusMessage *message,
dbus_int32_t slot);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_MESSAGE_H */
diff -ur dbus/dbus/dbus-message-handler.h sw/dbus/dbus/dbus-message-handler.h
--- dbus/dbus/dbus-message-handler.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-message-handler.h 2003-06-28 03:46:36.000000000 +0200
@@ -31,7 +31,7 @@
#include <dbus/dbus-types.h>
#include <dbus/dbus-connection.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef DBusHandlerResult (* DBusHandleMessageFunction) (DBusMessageHandler *handler,
DBusConnection *connection,
@@ -54,6 +54,6 @@
void dbus_message_handler_set_function (DBusMessageHandler *handler,
DBusHandleMessageFunction function);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_MESSAGE_HANDLER_H */
diff -ur dbus/dbus/dbus-message-internal.h sw/dbus/dbus/dbus-message-internal.h
--- dbus/dbus/dbus-message-internal.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-message-internal.h 2003-06-28 03:46:36.000000000 +0200
@@ -27,7 +27,7 @@
#include <dbus/dbus-resources.h>
#include <dbus/dbus-list.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusMessageLoader DBusMessageLoader;
@@ -69,6 +69,6 @@
long size);
long _dbus_message_loader_get_max_message_size (DBusMessageLoader *loader);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_MESSAGE_H */
diff -ur dbus/dbus/dbus-resources.h sw/dbus/dbus/dbus-resources.h
--- dbus/dbus/dbus-resources.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-resources.h 2003-06-28 03:46:36.000000000 +0200
@@ -27,7 +27,7 @@
#include <dbus/dbus-errors.h>
#include <dbus/dbus-connection.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusCounter DBusCounter;
@@ -47,6 +47,6 @@
void *user_data);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_RESOURCES_H */
diff -ur dbus/dbus/dbus-server-debug-pipe.h sw/dbus/dbus/dbus-server-debug-pipe.h
--- dbus/dbus/dbus-server-debug-pipe.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-server-debug-pipe.h 2003-06-28 03:46:36.000000000 +0200
@@ -28,13 +28,13 @@
#include <dbus/dbus-server-protected.h>
#include <dbus/dbus-transport.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
DBusServer* _dbus_server_debug_pipe_new (const char *server_name,
DBusError *error);
DBusTransport* _dbus_transport_debug_pipe_new (const char *server_name,
DBusError *error);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_SERVER_DEBUG_PIPE_H */
diff -ur dbus/dbus/dbus-server.h sw/dbus/dbus/dbus-server.h
--- dbus/dbus/dbus-server.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-server.h 2003-06-28 03:46:37.000000000 +0200
@@ -31,7 +31,7 @@
#include <dbus/dbus-message.h>
#include <dbus/dbus-connection.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusServer DBusServer;
@@ -74,6 +74,6 @@
void* dbus_server_get_data (DBusServer *server,
int slot);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_SERVER_H */
diff -ur dbus/dbus/dbus-server-protected.h sw/dbus/dbus/dbus-server-protected.h
--- dbus/dbus/dbus-server-protected.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-server-protected.h 2003-06-28 03:46:36.000000000 +0200
@@ -30,7 +30,7 @@
#include <dbus/dbus-resources.h>
#include <dbus/dbus-dataslot.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusServerVTable DBusServerVTable;
@@ -91,6 +91,6 @@
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_SERVER_PROTECTED_H */
diff -ur dbus/dbus/dbus-server-unix.h sw/dbus/dbus/dbus-server-unix.h
--- dbus/dbus/dbus-server-unix.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-server-unix.h 2003-06-28 03:46:37.000000000 +0200
@@ -26,7 +26,7 @@
#include <dbus/dbus-internals.h>
#include <dbus/dbus-server-protected.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
DBusServer* _dbus_server_new_for_fd (int fd,
const DBusString *address);
@@ -38,6 +38,6 @@
DBusError *error);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_SERVER_UNIX_H */
diff -ur dbus/dbus/dbus-sha.h sw/dbus/dbus/dbus-sha.h
--- dbus/dbus/dbus-sha.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-sha.h 2003-06-28 03:46:37.000000000 +0200
@@ -27,7 +27,7 @@
#include <dbus/dbus-errors.h>
#include <dbus/dbus-string.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusSHAContext DBusSHAContext;
@@ -47,6 +47,6 @@
dbus_bool_t _dbus_sha_compute (const DBusString *data,
DBusString *ascii_output);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_SHA_H */
diff -ur dbus/dbus/dbus-spawn.h sw/dbus/dbus/dbus-spawn.h
--- dbus/dbus/dbus-spawn.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-spawn.h 2003-06-28 03:46:37.000000000 +0200
@@ -29,7 +29,7 @@
#include <dbus/dbus-errors.h>
#include <dbus/dbus-watch.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef void (* DBusSpawnChildSetupFunc) (void *user_data);
@@ -53,6 +53,6 @@
void *data,
DBusFreeFunction free_data_function);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_SPAWN_H */
diff -ur dbus/dbus/dbus-string.h sw/dbus/dbus/dbus-string.h
--- dbus/dbus/dbus-string.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-string.h 2003-06-28 03:46:37.000000000 +0200
@@ -29,7 +29,7 @@
#include <dbus/dbus-memory.h>
#include <dbus/dbus-types.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusString DBusString;
@@ -225,6 +225,6 @@
void _dbus_string_zero (DBusString *str);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_STRING_H */
diff -ur dbus/dbus/dbus-string-private.h sw/dbus/dbus/dbus-string-private.h
--- dbus/dbus/dbus-string-private.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-string-private.h 2003-06-28 03:46:37.000000000 +0200
@@ -33,7 +33,7 @@
#error "Don't go including dbus-string-private.h for no good reason"
#endif
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
/**
* @brief Internals of DBusString.
@@ -53,6 +53,6 @@
unsigned int align_offset : 3; /**< str - align_offset is the actual malloc block */
} DBusRealString;
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_STRING_PRIVATE_H */
diff -ur dbus/dbus/dbus-sysdeps.h sw/dbus/dbus/dbus-sysdeps.h
--- dbus/dbus/dbus-sysdeps.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-sysdeps.h 2003-06-28 03:46:37.000000000 +0200
@@ -36,7 +36,7 @@
/* and it would just be annoying to abstract this */
#include <errno.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
/* The idea of this file is to encapsulate everywhere that we're
* relying on external libc features, for ease of security
@@ -287,6 +287,6 @@
DBusSignalHandler handler);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_SYSDEPS_H */
diff -ur dbus/dbus/dbus-threads.h sw/dbus/dbus/dbus-threads.h
--- dbus/dbus/dbus-threads.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-threads.h 2003-06-28 03:46:37.000000000 +0200
@@ -30,7 +30,7 @@
#include <dbus/dbus-macros.h>
#include <dbus/dbus-types.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusMutex DBusMutex;
typedef struct DBusCondVar DBusCondVar;
@@ -113,6 +113,6 @@
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_THREADS_H */
diff -ur dbus/dbus/dbus-timeout.h sw/dbus/dbus/dbus-timeout.h
--- dbus/dbus/dbus-timeout.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-timeout.h 2003-06-28 03:46:37.000000000 +0200
@@ -26,7 +26,7 @@
#include <dbus/dbus-connection.h>
#include <dbus/dbus-internals.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusTimeoutList DBusTimeoutList;
@@ -62,6 +62,6 @@
dbus_bool_t enabled);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_TIMEOUT_H */
diff -ur dbus/dbus/dbus-transport.h sw/dbus/dbus/dbus-transport.h
--- dbus/dbus/dbus-transport.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-transport.h 2003-06-28 03:46:37.000000000 +0200
@@ -26,7 +26,7 @@
#include <dbus/dbus-internals.h>
#include <dbus/dbus-connection.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusTransport DBusTransport;
@@ -70,6 +70,6 @@
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_TRANSPORT_H */
diff -ur dbus/dbus/dbus-transport-protected.h sw/dbus/dbus/dbus-transport-protected.h
--- dbus/dbus/dbus-transport-protected.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-transport-protected.h 2003-06-28 03:46:37.000000000 +0200
@@ -30,7 +30,7 @@
#include <dbus/dbus-auth.h>
#include <dbus/dbus-resources.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusTransportVTable DBusTransportVTable;
@@ -111,6 +111,6 @@
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_TRANSPORT_PROTECTED_H */
diff -ur dbus/dbus/dbus-transport-unix.h sw/dbus/dbus/dbus-transport-unix.h
--- dbus/dbus/dbus-transport-unix.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-transport-unix.h 2003-06-28 03:46:37.000000000 +0200
@@ -25,7 +25,7 @@
#include <dbus/dbus-transport.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
DBusTransport* _dbus_transport_new_for_fd (int fd,
dbus_bool_t server,
@@ -38,6 +38,6 @@
DBusError *error);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_TRANSPORT_UNIX_H */
diff -ur dbus/dbus/dbus-userdb.h sw/dbus/dbus/dbus-userdb.h
--- dbus/dbus/dbus-userdb.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-userdb.h 2003-06-28 03:46:37.000000000 +0200
@@ -26,7 +26,7 @@
#include <dbus/dbus-sysdeps.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusUserDatabase DBusUserDatabase;
@@ -77,6 +77,6 @@
DBusCredentials *credentials);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_USERDB_H */
diff -ur dbus/dbus/dbus-watch.h sw/dbus/dbus/dbus-watch.h
--- dbus/dbus/dbus-watch.h 2003-06-28 01:16:52.000000000 +0200
+++ sw/dbus/dbus/dbus-watch.h 2003-06-28 03:46:27.000000000 +0200
@@ -26,7 +26,7 @@
#include <dbus/dbus-internals.h>
#include <dbus/dbus-connection.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
/* Public methods on DBusWatch are in dbus-connection.h */
@@ -70,6 +70,6 @@
dbus_bool_t enabled);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_WATCH_H */
--gKMricLos+KVdGMg--