diff -ruN dbus/dbus/dbus/dbus-arch-deps.h.in dbus.hacked/dbus/dbus/dbus-arch-deps.h.in --- dbus/dbus/dbus/dbus-arch-deps.h.in 2003-04-22 21:33:52.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-arch-deps.h.in 2003-11-24 23:08:36.000000000 -0600 @@ -30,7 +30,7 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-auth.h dbus.hacked/dbus/dbus/dbus-auth.h --- dbus/dbus/dbus/dbus-auth.h 2003-03-31 23:33:01.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-auth.h 2003-11-24 22:59:32.000000000 -0600 @@ -28,7 +28,7 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-auth-script.h dbus.hacked/dbus/dbus/dbus-auth-script.h --- dbus/dbus/dbus/dbus-auth-script.h 2003-02-12 18:08:18.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-auth-script.h 2003-11-24 23:08:54.000000000 -0600 @@ -30,10 +30,10 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-bus.h dbus.hacked/dbus/dbus/dbus-bus.h --- dbus/dbus/dbus/dbus-bus.h 2003-09-29 20:32:52.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-bus.h 2003-11-24 23:02:59.000000000 -0600 @@ -29,7 +29,7 @@ #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS typedef enum { @@ -66,6 +66,6 @@ const char *rule, DBusError *error); -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_BUS_H */ diff -ruN dbus/dbus/dbus/dbus-connection.h dbus.hacked/dbus/dbus/dbus-connection.h --- dbus/dbus/dbus/dbus-connection.h 2003-09-29 20:32:52.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-connection.h 2003-11-24 23:02:41.000000000 -0600 @@ -31,7 +31,7 @@ #include #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS typedef struct DBusWatch DBusWatch; typedef struct DBusTimeout DBusTimeout; @@ -246,6 +246,6 @@ const char **parent_path, char ***child_entries); -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_CONNECTION_H */ diff -ruN dbus/dbus/dbus/dbus-connection-internal.h dbus.hacked/dbus/dbus/dbus-connection-internal.h --- dbus/dbus/dbus/dbus-connection-internal.h 2003-10-26 09:36:15.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-connection-internal.h 2003-11-24 23:04:45.000000000 -0600 @@ -32,7 +32,7 @@ #include #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS typedef enum { @@ -123,6 +123,6 @@ /** @} End of DBusPendingCallInternals */ -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_CONNECTION_INTERNAL_H */ diff -ruN dbus/dbus/dbus/dbus-dataslot.h dbus.hacked/dbus/dbus/dbus-dataslot.h --- dbus/dbus/dbus/dbus-dataslot.h 2003-09-29 20:32:52.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-dataslot.h 2003-11-24 23:04:29.000000000 -0600 @@ -25,7 +25,7 @@ #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS typedef struct DBusDataSlotAllocator DBusDataSlotAllocator; typedef struct DBusDataSlotList DBusDataSlotList; @@ -90,6 +90,6 @@ void _dbus_data_slot_list_free (DBusDataSlotList *list); -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_DATASLOT_H */ diff -ruN dbus/dbus/dbus/dbus-errors.h dbus.hacked/dbus/dbus/dbus-errors.h --- dbus/dbus/dbus/dbus-errors.h 2003-10-09 20:42:20.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-errors.h 2003-11-24 22:57:01.000000000 -0600 @@ -31,7 +31,7 @@ #include #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS typedef struct DBusError DBusError; @@ -95,6 +95,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 -ruN dbus/dbus/dbus/dbus-hash.h dbus.hacked/dbus/dbus/dbus-hash.h --- dbus/dbus/dbus/dbus-hash.h 2003-09-29 20:32:52.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-hash.h 2003-11-24 23:04:59.000000000 -0600 @@ -27,7 +27,7 @@ #include #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS /** Hash iterator object. The iterator is on the stack, but its real * fields are hidden privately. @@ -127,6 +127,6 @@ void *value); -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_HASH_H */ diff -ruN dbus/dbus/dbus/dbus-internals.h dbus.hacked/dbus/dbus/dbus-internals.h --- dbus/dbus/dbus/dbus-internals.h 2003-10-20 23:46:51.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-internals.h 2003-11-24 22:58:38.000000000 -0600 @@ -35,7 +35,7 @@ #include #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS void _dbus_warn (const char *format, ...) _DBUS_GNUC_PRINTF (1, 2); @@ -269,6 +269,6 @@ dbus_bool_t _dbus_threads_init_debug (void); -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_INTERNALS_H */ diff -ruN dbus/dbus/dbus/dbus-keyring.h dbus.hacked/dbus/dbus/dbus-keyring.h --- dbus/dbus/dbus/dbus-keyring.h 2003-03-04 20:01:34.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-keyring.h 2003-11-24 22:59:54.000000000 -0600 @@ -27,7 +27,7 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-list.h dbus.hacked/dbus/dbus/dbus-list.h --- dbus/dbus/dbus/dbus-list.h 2003-05-11 20:44:44.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-list.h 2003-11-24 22:58:59.000000000 -0600 @@ -28,7 +28,7 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-md5.h dbus.hacked/dbus/dbus/dbus-md5.h --- dbus/dbus/dbus/dbus-md5.h 2003-09-29 20:32:52.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-md5.h 2003-11-24 23:09:09.000000000 -0600 @@ -27,7 +27,7 @@ #include #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS typedef struct DBusMD5Context DBusMD5Context; @@ -49,6 +49,6 @@ dbus_bool_t _dbus_md5_compute (const DBusString *data, DBusString *ascii_output); -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_MD5_H */ diff -ruN dbus/dbus/dbus/dbus-memory.h dbus.hacked/dbus/dbus/dbus-memory.h --- dbus/dbus/dbus/dbus-memory.h 2003-03-23 21:16:58.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-memory.h 2003-11-24 22:57:28.000000000 -0600 @@ -30,7 +30,7 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-mempool.h dbus.hacked/dbus/dbus/dbus-mempool.h --- dbus/dbus/dbus/dbus-mempool.h 2003-03-16 02:08:20.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-mempool.h 2003-11-24 23:09:24.000000000 -0600 @@ -28,7 +28,7 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-message-builder.h dbus.hacked/dbus/dbus/dbus-message-builder.h --- dbus/dbus/dbus/dbus-message-builder.h 2003-01-26 15:16:06.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-message-builder.h 2003-11-24 23:06:08.000000000 -0600 @@ -30,11 +30,11 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-message.h dbus.hacked/dbus/dbus/dbus-message.h --- dbus/dbus/dbus/dbus-message.h 2003-10-20 23:46:51.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-message.h 2003-11-24 23:02:09.000000000 -0600 @@ -34,7 +34,7 @@ #include #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS typedef struct DBusMessage DBusMessage; typedef struct DBusMessageIter DBusMessageIter; @@ -283,6 +283,6 @@ int dbus_message_type_from_string (const char *type_str); -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_MESSAGE_H */ diff -ruN dbus/dbus/dbus/dbus-message-handler.h dbus.hacked/dbus/dbus/dbus-message-handler.h --- dbus/dbus/dbus/dbus-message-handler.h 2002-12-24 00:37:32.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-message-handler.h 2003-11-24 23:09:39.000000000 -0600 @@ -31,7 +31,7 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-message-internal.h dbus.hacked/dbus/dbus/dbus-message-internal.h --- dbus/dbus/dbus/dbus-message-internal.h 2003-05-11 20:44:44.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-message-internal.h 2003-11-24 23:05:14.000000000 -0600 @@ -27,7 +27,7 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-object-tree.h dbus.hacked/dbus/dbus/dbus-object-tree.h --- dbus/dbus/dbus/dbus-object-tree.h 2003-09-29 20:32:53.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-object-tree.h 2003-11-24 23:05:43.000000000 -0600 @@ -25,7 +25,7 @@ #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS typedef struct DBusObjectTree DBusObjectTree; @@ -47,6 +47,6 @@ dbus_bool_t _dbus_object_tree_list_registered_and_unlock (DBusObjectTree *tree, const char **parent_path, char ***child_entries); -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_OBJECT_TREE_H */ diff -ruN dbus/dbus/dbus/dbus-pending-call.h dbus.hacked/dbus/dbus/dbus-pending-call.h --- dbus/dbus/dbus/dbus-pending-call.h 2003-09-29 20:32:53.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-pending-call.h 2003-11-24 23:05:28.000000000 -0600 @@ -31,7 +31,7 @@ #include #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS void dbus_pending_call_ref (DBusPendingCall *pending); void dbus_pending_call_unref (DBusPendingCall *pending); @@ -53,6 +53,6 @@ void* dbus_pending_call_get_data (DBusPendingCall *pending, dbus_int32_t slot); -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_PENDING_CALL_H */ diff -ruN dbus/dbus/dbus/dbus-resources.h dbus.hacked/dbus/dbus/dbus-resources.h --- dbus/dbus/dbus/dbus-resources.h 2003-01-18 21:33:35.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-resources.h 2003-11-24 23:04:16.000000000 -0600 @@ -27,7 +27,7 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-server-debug-pipe.h dbus.hacked/dbus/dbus/dbus-server-debug-pipe.h --- dbus/dbus/dbus/dbus-server-debug-pipe.h 2003-03-24 22:37:08.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-server-debug-pipe.h 2003-11-24 23:09:57.000000000 -0600 @@ -28,13 +28,13 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-server.h dbus.hacked/dbus/dbus/dbus-server.h --- dbus/dbus/dbus/dbus-server.h 2003-06-22 13:39:47.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-server.h 2003-11-24 23:07:29.000000000 -0600 @@ -31,7 +31,7 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-server-protected.h dbus.hacked/dbus/dbus/dbus-server-protected.h --- dbus/dbus/dbus/dbus-server-protected.h 2003-09-29 20:32:53.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-server-protected.h 2003-11-24 23:10:11.000000000 -0600 @@ -30,7 +30,7 @@ #include #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS typedef struct DBusServerVTable DBusServerVTable; @@ -97,6 +97,6 @@ -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_SERVER_PROTECTED_H */ diff -ruN dbus/dbus/dbus/dbus-server-unix.h dbus.hacked/dbus/dbus/dbus-server-unix.h --- dbus/dbus/dbus/dbus-server-unix.h 2003-06-03 23:20:20.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-server-unix.h 2003-11-24 23:10:23.000000000 -0600 @@ -26,7 +26,7 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-sha.h dbus.hacked/dbus/dbus/dbus-sha.h --- dbus/dbus/dbus/dbus-sha.h 2003-09-29 20:32:53.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-sha.h 2003-11-24 23:00:09.000000000 -0600 @@ -27,7 +27,7 @@ #include #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS typedef struct DBusSHAContext DBusSHAContext; @@ -50,6 +50,6 @@ dbus_bool_t _dbus_sha_compute (const DBusString *data, DBusString *ascii_output); -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_SHA_H */ diff -ruN dbus/dbus/dbus/dbus-spawn.h dbus.hacked/dbus/dbus/dbus-spawn.h --- dbus/dbus/dbus/dbus-spawn.h 2003-04-17 22:18:57.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-spawn.h 2003-11-24 23:10:36.000000000 -0600 @@ -29,7 +29,7 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-string.c dbus.hacked/dbus/dbus/dbus-string.c --- dbus/dbus/dbus/dbus-string.c 2003-10-28 16:53:36.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-string.c 2003-11-24 23:34:20.000000000 -0600 @@ -129,8 +129,8 @@ static void fixup_alignment (DBusRealString *real) { - char *aligned; - char *real_block; + unsigned char *aligned; + unsigned char *real_block; unsigned int old_align_offset; /* we have to have extra space in real->allocated for the align offset and nul byte */ @@ -289,7 +289,7 @@ real = (DBusRealString*) str; - real->str = (char*) value; + real->str = (unsigned char*) value; real->len = len; real->allocated = real->len + ALLOCATION_PADDING; /* a lie, just to avoid special-case assertions... */ real->max_length = real->len + 1; @@ -367,7 +367,7 @@ int new_length) { int new_allocated; - char *new_str; + unsigned char *new_str; /* at least double our old allocation to avoid O(n), avoiding * overflow @@ -453,7 +453,7 @@ * @param str the string * @returns the data */ -char* +unsigned char* _dbus_string_get_data (DBusString *str) { DBUS_STRING_PREAMBLE (str); diff -ruN dbus/dbus/dbus/dbus-string.h dbus.hacked/dbus/dbus/dbus-string.h --- dbus/dbus/dbus/dbus-string.h 2003-10-20 23:46:52.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-string.h 2003-11-24 23:35:14.000000000 -0600 @@ -32,7 +32,7 @@ #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS /** * DBusString object @@ -59,7 +59,7 @@ int allocate_size); void _dbus_string_free (DBusString *str); void _dbus_string_lock (DBusString *str); -char* _dbus_string_get_data (DBusString *str); +unsigned char* _dbus_string_get_data (DBusString *str); const char* _dbus_string_get_const_data (const DBusString *str); char* _dbus_string_get_data_len (DBusString *str, int start, @@ -245,6 +245,6 @@ void _dbus_string_zero (DBusString *str); -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_STRING_H */ diff -ruN dbus/dbus/dbus/dbus-string-private.h dbus.hacked/dbus/dbus/dbus-string-private.h --- dbus/dbus/dbus/dbus-string-private.h 2003-02-26 22:17:44.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-string-private.h 2003-11-24 23:10:50.000000000 -0600 @@ -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 -ruN dbus/dbus/dbus/dbus-sysdeps.h dbus.hacked/dbus/dbus/dbus-sysdeps.h --- dbus/dbus/dbus/dbus-sysdeps.h 2003-09-29 20:32:53.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-sysdeps.h 2003-11-24 22:57:51.000000000 -0600 @@ -35,7 +35,7 @@ /* and it would just be annoying to abstract this */ #include -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 @@ -306,6 +306,6 @@ DBusSignalHandler handler); -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_SYSDEPS_H */ diff -ruN dbus/dbus/dbus/dbus-threads.h dbus.hacked/dbus/dbus/dbus-threads.h --- dbus/dbus/dbus/dbus-threads.h 2003-09-29 20:32:53.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-threads.h 2003-11-24 22:58:17.000000000 -0600 @@ -30,7 +30,7 @@ #include #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS typedef struct DBusMutex DBusMutex; typedef struct DBusCondVar DBusCondVar; @@ -117,6 +117,6 @@ -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_THREADS_H */ diff -ruN dbus/dbus/dbus/dbus-timeout.h dbus.hacked/dbus/dbus/dbus-timeout.h --- dbus/dbus/dbus/dbus-timeout.h 2003-04-24 15:26:25.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-timeout.h 2003-11-24 23:03:26.000000000 -0600 @@ -26,7 +26,7 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-transport.h dbus.hacked/dbus/dbus/dbus-transport.h --- dbus/dbus/dbus/dbus-transport.h 2003-04-16 17:01:33.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-transport.h 2003-11-24 23:03:43.000000000 -0600 @@ -26,7 +26,7 @@ #include #include -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 -ruN dbus/dbus/dbus/dbus-transport-protected.h dbus.hacked/dbus/dbus/dbus-transport-protected.h --- dbus/dbus/dbus/dbus-transport-protected.h 2003-09-29 20:32:53.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-transport-protected.h 2003-11-24 23:11:05.000000000 -0600 @@ -30,7 +30,7 @@ #include #include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS typedef struct DBusTransportVTable DBusTransportVTable; @@ -121,6 +121,6 @@ -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_TRANSPORT_PROTECTED_H */ diff -ruN dbus/dbus/dbus/dbus-transport-unix.h dbus.hacked/dbus/dbus/dbus-transport-unix.h --- dbus/dbus/dbus/dbus-transport-unix.h 2003-06-03 23:20:20.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-transport-unix.h 2003-11-24 23:11:18.000000000 -0600 @@ -25,7 +25,7 @@ #include -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 -ruN dbus/dbus/dbus/dbus-userdb.h dbus.hacked/dbus/dbus/dbus-userdb.h --- dbus/dbus/dbus/dbus-userdb.h 2003-04-17 17:17:04.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-userdb.h 2003-11-24 23:07:05.000000000 -0600 @@ -26,7 +26,7 @@ #include -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 -ruN dbus/dbus/dbus/dbus-watch.h dbus.hacked/dbus/dbus/dbus-watch.h --- dbus/dbus/dbus/dbus-watch.h 2003-04-17 22:18:57.000000000 -0600 +++ dbus.hacked/dbus/dbus/dbus-watch.h 2003-11-24 23:04:02.000000000 -0600 @@ -26,7 +26,7 @@ #include #include -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 */