+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
#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 */
#include <dbus/dbus-string.h>
#include <dbus/dbus-sysdeps.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusAuth DBusAuth;
const DBusString *context);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_AUTH_H */
#include <dbus/dbus-connection.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
DBusConnection *dbus_bus_get (DBusBusType type,
DBusError *error);
const char *rule,
DBusError *error);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_BUS_H */
#include <dbus/dbus-timeout.h>
#include <dbus/dbus-dataslot.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef enum
{
/** @} End of DBusPendingCallInternals */
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_CONNECTION_INTERNAL_H */
#include <dbus/dbus-message.h>
#include <dbus/dbus-shared.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusWatch DBusWatch;
typedef struct DBusTimeout DBusTimeout;
dbus_bool_t dbus_connection_get_unix_fd (DBusConnection *connection,
int *fd);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_CONNECTION_H */
#include <dbus/dbus-internals.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusDataSlotAllocator DBusDataSlotAllocator;
typedef struct DBusDataSlotList DBusDataSlotList;
void _dbus_data_slot_list_free (DBusDataSlotList *list);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_DATASLOT_H */
#include <dbus/dbus-macros.h>
#include <dbus/dbus-types.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusError DBusError;
const char *name);
dbus_bool_t dbus_error_is_set (const DBusError *error);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_ERROR_H */
#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.
void *value);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_HASH_H */
#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);
dbus_bool_t _dbus_threads_init_debug (void);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_INTERNALS_H */
#include <dbus/dbus-errors.h>
#include <dbus/dbus-string.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusKeyring DBusKeyring;
int key_id,
DBusString *hex_key);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_KEYRING_H */
#include <dbus/dbus-memory.h>
#include <dbus/dbus-types.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusList DBusList;
#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 */
#include <dbus/dbus-errors.h>
#include <dbus/dbus-string.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusMD5Context DBusMD5Context;
dbus_bool_t _dbus_md5_compute (const DBusString *data,
DBusString *ascii_output);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_MD5_H */
#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);
void dbus_shutdown (void);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_MEMORY_H */
#include <dbus/dbus-memory.h>
#include <dbus/dbus-types.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusMemPool DBusMemPool;
dbus_bool_t _dbus_mem_pool_dealloc (DBusMemPool *pool,
void *element);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_MEMPOOL_H */
#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 */
#include <dbus/dbus-resources.h>
#include <dbus/dbus-list.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusMessageLoader DBusMessageLoader;
long size);
long _dbus_message_loader_get_max_message_size (DBusMessageLoader *loader);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_MESSAGE_H */
#include <dbus/dbus-errors.h>
#include <stdarg.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusMessage DBusMessage;
typedef struct DBusMessageIter DBusMessageIter;
int dbus_message_type_from_string (const char *type_str);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_MESSAGE_H */
#include <dbus/dbus-connection.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusObjectTree 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 */
#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);
void* dbus_pending_call_get_data (DBusPendingCall *pending,
dbus_int32_t slot);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_PENDING_CALL_H */
#include <dbus/dbus-errors.h>
#include <dbus/dbus-connection.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusCounter DBusCounter;
void *user_data);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_RESOURCES_H */
#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 */
#include <dbus/dbus-resources.h>
#include <dbus/dbus-dataslot.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusServerVTable DBusServerVTable;
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_SERVER_PROTECTED_H */
#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);
DBusError *error);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_SERVER_UNIX_H */
#include <dbus/dbus-connection.h>
#include <dbus/dbus-protocol.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusServer DBusServer;
void* dbus_server_get_data (DBusServer *server,
int slot);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_SERVER_H */
#include <dbus/dbus-errors.h>
#include <dbus/dbus-string.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusSHAContext DBusSHAContext;
dbus_bool_t _dbus_sha_compute (const DBusString *data,
DBusString *ascii_output);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_SHA_H */
#include <dbus/dbus-errors.h>
#include <dbus/dbus-watch.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef void (* DBusSpawnChildSetupFunc) (void *user_data);
void *data,
DBusFreeFunction free_data_function);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_SPAWN_H */
#error "Don't go including dbus-string-private.h for no good reason"
#endif
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
/**
* @brief Internals of DBusString.
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 */
#include <stdarg.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
/**
* DBusString object
void _dbus_string_zero (DBusString *str);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_STRING_H */
/* 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
#endif /* !DBUS_VA_COPY */
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_SYSDEPS_H */
#include <dbus/dbus-macros.h>
#include <dbus/dbus-types.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusMutex DBusMutex;
typedef struct DBusCondVar DBusCondVar;
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_THREADS_H */
#include <dbus/dbus-connection.h>
#include <dbus/dbus-internals.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusTimeoutList DBusTimeoutList;
dbus_bool_t enabled);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_TIMEOUT_H */
#include <dbus/dbus-auth.h>
#include <dbus/dbus-resources.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusTransportVTable DBusTransportVTable;
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_TRANSPORT_PROTECTED_H */
#include <dbus/dbus-transport.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
DBusTransport* _dbus_transport_new_for_fd (int fd,
dbus_bool_t server,
DBusError *error);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_TRANSPORT_UNIX_H */
#include <dbus/dbus-connection.h>
#include <dbus/dbus-protocol.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusTransport DBusTransport;
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_TRANSPORT_H */
#include <dbus/dbus-sysdeps.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
typedef struct DBusUserDatabase DBusUserDatabase;
DBusError *error);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_USERDB_H */
#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 */
dbus_bool_t enabled);
-DBUS_END_DECLS;
+DBUS_END_DECLS
#endif /* DBUS_WATCH_H */