Commit a9ff341a authored by Olivier Andrieu's avatar Olivier Andrieu

remove the ; after DBUS_(BEGIN|END)_DECLS (bug #974)

parent 7f68b308
2004-09-09 Olivier Andrieu <oliv__a@users.sourceforge.net>
* dbus/dbus-*.h: remove the ; after DBUS_(BEGIN|END)_DECLS. Some C
compilers don't like it (bug #974).
2004-09-04 Harald Fernengel <harry@kdevelop.org>
* qt/connection.*: Applied patch by Jérôme Lodewyck
......
......@@ -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 */
......@@ -28,7 +28,7 @@
#include <dbus/dbus-string.h>
#include <dbus/dbus-sysdeps.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
typedef struct DBusAuth DBusAuth;
......@@ -76,6 +76,6 @@ dbus_bool_t _dbus_auth_set_context (DBusAuth *auth,
const DBusString *context);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_AUTH_H */
......@@ -29,7 +29,7 @@
#include <dbus/dbus-connection.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
DBusConnection *dbus_bus_get (DBusBusType type,
DBusError *error);
......@@ -62,6 +62,6 @@ void dbus_bus_remove_match (DBusConnection *connection,
const char *rule,
DBusError *error);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_BUS_H */
......@@ -32,7 +32,7 @@
#include <dbus/dbus-timeout.h>
#include <dbus/dbus-dataslot.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
typedef enum
{
......@@ -123,6 +123,6 @@ struct DBusPendingCall
/** @} End of DBusPendingCallInternals */
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_CONNECTION_INTERNAL_H */
......@@ -32,7 +32,7 @@
#include <dbus/dbus-message.h>
#include <dbus/dbus-shared.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
typedef struct DBusWatch DBusWatch;
typedef struct DBusTimeout DBusTimeout;
......@@ -245,6 +245,6 @@ dbus_bool_t dbus_connection_list_registered (DBusConnection
dbus_bool_t dbus_connection_get_unix_fd (DBusConnection *connection,
int *fd);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_CONNECTION_H */
......@@ -25,7 +25,7 @@
#include <dbus/dbus-internals.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
typedef struct DBusDataSlotAllocator DBusDataSlotAllocator;
typedef struct DBusDataSlotList DBusDataSlotList;
......@@ -90,6 +90,6 @@ void* _dbus_data_slot_list_get (DBusDataSlotAllocator *allocator,
void _dbus_data_slot_list_free (DBusDataSlotList *list);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_DATASLOT_H */
......@@ -31,7 +31,7 @@
#include <dbus/dbus-macros.h>
#include <dbus/dbus-types.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
typedef struct DBusError DBusError;
......@@ -67,6 +67,6 @@ dbus_bool_t dbus_error_has_name (const DBusError *error,
const char *name);
dbus_bool_t dbus_error_is_set (const DBusError *error);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_ERROR_H */
......@@ -27,7 +27,7 @@
#include <dbus/dbus-memory.h>
#include <dbus/dbus-types.h>
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 _dbus_hash_table_insert_string_preallocated (DBusHashTable
void *value);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_HASH_H */
......@@ -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);
......@@ -269,6 +269,6 @@ _DBUS_DECLARE_GLOBAL_LOCK (system_users);
dbus_bool_t _dbus_threads_init_debug (void);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_INTERNALS_H */
......@@ -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 @@ dbus_bool_t _dbus_keyring_get_hex_key (DBusKeyring *keyring,
int key_id,
DBusString *hex_key);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_KEYRING_H */
......@@ -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 @@ void _dbus_list_foreach (DBusList **list,
#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 */
......@@ -27,7 +27,7 @@
#include <dbus/dbus-errors.h>
#include <dbus/dbus-string.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
typedef struct DBusMD5Context DBusMD5Context;
......@@ -49,6 +49,6 @@ dbus_bool_t _dbus_md5_final (DBusMD5Context *context,
dbus_bool_t _dbus_md5_compute (const DBusString *data,
DBusString *ascii_output);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_MD5_H */
......@@ -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 @@ typedef void (* DBusFreeFunction) (void *memory);
void dbus_shutdown (void);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_MEMORY_H */
......@@ -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 @@ void* _dbus_mem_pool_alloc (DBusMemPool *pool);
dbus_bool_t _dbus_mem_pool_dealloc (DBusMemPool *pool,
void *element);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_MEMPOOL_H */
......@@ -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 */
......@@ -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 @@ void _dbus_message_loader_set_max_message_size (DBusMessageLoader
long size);
long _dbus_message_loader_get_max_message_size (DBusMessageLoader *loader);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_MESSAGE_H */
......@@ -34,7 +34,7 @@
#include <dbus/dbus-errors.h>
#include <stdarg.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
typedef struct DBusMessage DBusMessage;
typedef struct DBusMessageIter DBusMessageIter;
......@@ -296,6 +296,6 @@ void* dbus_message_get_data (DBusMessage *message,
int dbus_message_type_from_string (const char *type_str);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_MESSAGE_H */
......@@ -25,7 +25,7 @@
#include <dbus/dbus-connection.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
typedef struct DBusObjectTree DBusObjectTree;
......@@ -47,6 +47,6 @@ void _dbus_object_tree_free_all_unlocked (DBusObjectTree
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 */
......@@ -31,7 +31,7 @@
#include <dbus/dbus-types.h>
#include <dbus/dbus-connection.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
DBusPendingCall* dbus_pending_call_ref (DBusPendingCall *pending);
void dbus_pending_call_unref (DBusPendingCall *pending);
......@@ -53,6 +53,6 @@ dbus_bool_t dbus_pending_call_set_data (DBusPendingCall *pending,
void* dbus_pending_call_get_data (DBusPendingCall *pending,
dbus_int32_t slot);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_PENDING_CALL_H */
......@@ -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 _dbus_counter_set_notify (DBusCounter *counter,
void *user_data);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_RESOURCES_H */
......@@ -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 */
......@@ -30,7 +30,7 @@
#include <dbus/dbus-resources.h>
#include <dbus/dbus-dataslot.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
typedef struct DBusServerVTable DBusServerVTable;
......@@ -97,6 +97,6 @@ void _dbus_server_toggle_timeout (DBusServer *server,
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_SERVER_PROTECTED_H */
......@@ -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 @@ DBusServer* _dbus_server_new_for_tcp_socket (const char *host,
DBusError *error);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_SERVER_UNIX_H */
......@@ -32,7 +32,7 @@
#include <dbus/dbus-connection.h>
#include <dbus/dbus-protocol.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
typedef struct DBusServer DBusServer;
......@@ -75,6 +75,6 @@ dbus_bool_t dbus_server_set_data (DBusServer *server,
void* dbus_server_get_data (DBusServer *server,
int slot);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_SERVER_H */
......@@ -27,7 +27,7 @@
#include <dbus/dbus-errors.h>
#include <dbus/dbus-string.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
typedef struct DBusSHAContext DBusSHAContext;
......@@ -50,6 +50,6 @@ dbus_bool_t _dbus_sha_final (DBusSHAContext *context,
dbus_bool_t _dbus_sha_compute (const DBusString *data,
DBusString *ascii_output);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_SHA_H */
......@@ -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 @@ dbus_bool_t _dbus_babysitter_set_watch_functions (DBusBabysitter *si
void *data,
DBusFreeFunction free_data_function);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_SPAWN_H */
......@@ -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 @@ typedef struct
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 */
......@@ -32,7 +32,7 @@
#include <stdarg.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
/**
* DBusString object
......@@ -243,6 +243,6 @@ dbus_bool_t _dbus_string_validate_service (const DBusString *str,
void _dbus_string_zero (DBusString *str);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_STRING_H */
......@@ -37,7 +37,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
......@@ -329,6 +329,6 @@ dbus_bool_t _dbus_user_at_console (const char *username,
#endif /* !DBUS_VA_COPY */
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_SYSDEPS_H */
......@@ -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;
......@@ -117,6 +117,6 @@ dbus_bool_t dbus_threads_init (const DBusThreadFunctions *functions);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_THREADS_H */
......@@ -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 @@ void _dbus_timeout_list_toggle_timeout (DBusTimeoutList *t
dbus_bool_t enabled);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_TIMEOUT_H */
......@@ -30,7 +30,7 @@
#include <dbus/dbus-auth.h>
#include <dbus/dbus-resources.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
typedef struct DBusTransportVTable DBusTransportVTable;
......@@ -126,6 +126,6 @@ void _dbus_transport_finalize_base (DBusTransport *transport)
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_TRANSPORT_PROTECTED_H */
......@@ -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 @@ DBusTransport* _dbus_transport_new_for_tcp_socket (const char *host,
DBusError *error);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_TRANSPORT_UNIX_H */
......@@ -27,7 +27,7 @@
#include <dbus/dbus-connection.h>
#include <dbus/dbus-protocol.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
typedef struct DBusTransport DBusTransport;
......@@ -76,6 +76,6 @@ dbus_bool_t _dbus_transport_set_auth_mechanisms (DBusTransport
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_TRANSPORT_H */
......@@ -26,7 +26,7 @@
#include <dbus/dbus-sysdeps.h>
DBUS_BEGIN_DECLS;
DBUS_BEGIN_DECLS
typedef struct DBusUserDatabase DBusUserDatabase;
......@@ -78,6 +78,6 @@ dbus_bool_t _dbus_is_console_user (dbus_uid_t uid,
DBusError *error);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_USERDB_H */
......@@ -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 @@ void _dbus_watch_list_toggle_watch (DBusWatchList *watch_li
dbus_bool_t enabled);
DBUS_END_DECLS;
DBUS_END_DECLS
#endif /* DBUS_WATCH_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment