diff options
| author | Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de> | 2010-03-19 12:36:49 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2010-03-19 20:11:48 +0100 |
| commit | dbecdeabb20e0ce11121819c63373f0afba57c58 (patch) | |
| tree | d513551d0794c6224406ac7b83a77f1355493fae | |
| parent | 6663cb5dcf6ef931e17b4104f571c59d411219d2 (diff) | |
| download | dbus-dbecdeabb20e0ce11121819c63373f0afba57c58.tar.gz | |
Consistently include <config.h> in all C source files and never in header files.
119 files changed, 120 insertions, 40 deletions
diff --git a/bus/activation.c b/bus/activation.c index 2fcd85d2..54296c1d 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "activation.h" #include "activation-exit-codes.h" #include "desktop-file.h" @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "bus.h" #include "activation.h" #include "connection.h" @@ -24,8 +24,6 @@ #ifndef BUS_BUS_H #define BUS_BUS_H -#include <config.h> - #include <dbus/dbus.h> #include <dbus/dbus-string.h> #include <dbus/dbus-mainloop.h> diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c index c0620aed..51bbb51b 100644 --- a/bus/config-loader-expat.c +++ b/bus/config-loader-expat.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "config-parser.h" #include <dbus/dbus-internals.h> #include <expat.h> diff --git a/bus/config-loader-libxml.c b/bus/config-loader-libxml.c index 3d82a633..c73a1815 100644 --- a/bus/config-loader-libxml.c +++ b/bus/config-loader-libxml.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "config-parser.h" #include <dbus/dbus-internals.h> #include <libxml/xmlreader.h> diff --git a/bus/config-parser-common.c b/bus/config-parser-common.c index ebcb7177..f8d75be7 100644 --- a/bus/config-parser-common.c +++ b/bus/config-parser-common.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include <dbus/dbus-internals.h> #include <string.h> diff --git a/bus/config-parser-common.h b/bus/config-parser-common.h index dc0e0eda..da745606 100644 --- a/bus/config-parser-common.h +++ b/bus/config-parser-common.h @@ -24,8 +24,6 @@ #ifndef BUS_CONFIG_PARSER_COMMON_H #define BUS_CONFIG_PARSER_COMMON_H -#include <config.h> - typedef enum { ELEMENT_NONE, diff --git a/bus/config-parser-trivial.c b/bus/config-parser-trivial.c index fd016a84..a35226a6 100644 --- a/bus/config-parser-trivial.c +++ b/bus/config-parser-trivial.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "config-parser-common.h" #include "config-parser-trivial.h" #include "utils.h" diff --git a/bus/config-parser-trivial.h b/bus/config-parser-trivial.h index ce542bfb..70e5d5bd 100644 --- a/bus/config-parser-trivial.h +++ b/bus/config-parser-trivial.h @@ -24,8 +24,6 @@ #ifndef BUS_CONFIG_PARSER_TRIVIAL_H #define BUS_CONFIG_PARSER_TRIVIAL_H -#include <config.h> - #include <dbus/dbus.h> #include <dbus/dbus-string.h> #include <dbus/dbus-list.h> diff --git a/bus/config-parser.c b/bus/config-parser.c index d8ae4590..2d19f2b9 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "config-parser-common.h" #include "config-parser.h" #include "test.h" diff --git a/bus/config-parser.h b/bus/config-parser.h index 3aac1ed3..ba5bf749 100644 --- a/bus/config-parser.h +++ b/bus/config-parser.h @@ -24,8 +24,6 @@ #ifndef BUS_CONFIG_PARSER_H #define BUS_CONFIG_PARSER_H -#include <config.h> - #include <dbus/dbus.h> #include <dbus/dbus-string.h> #include <dbus/dbus-list.h> diff --git a/bus/connection.c b/bus/connection.c index 50807f1a..b2d6aa57 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "connection.h" #include "dispatch.h" #include "policy.h" diff --git a/bus/desktop-file.c b/bus/desktop-file.c index 9f88d6e7..ae441c5e 100644 --- a/bus/desktop-file.c +++ b/bus/desktop-file.c @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include <dbus/dbus-sysdeps.h> #include <dbus/dbus-internals.h> #include "desktop-file.h" diff --git a/bus/dispatch.c b/bus/dispatch.c index 2fc04307..afb85a73 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -23,6 +23,7 @@ * */ +#include <config.h> #include "dispatch.h" #include "connection.h" #include "driver.h" diff --git a/bus/driver.c b/bus/driver.c index 5e8a7a26..0dcfdaa4 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "activation.h" #include "connection.h" #include "driver.h" diff --git a/bus/expirelist.c b/bus/expirelist.c index 58e1f6d1..d957536d 100644 --- a/bus/expirelist.c +++ b/bus/expirelist.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "expirelist.h" #include "test.h" #include <dbus/dbus-internals.h> @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "bus.h" #include "driver.h" #include <dbus/dbus-internals.h> diff --git a/bus/policy.c b/bus/policy.c index bc1d2d9d..27c89ac2 100644 --- a/bus/policy.c +++ b/bus/policy.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "policy.h" #include "services.h" #include "test.h" diff --git a/bus/selinux.c b/bus/selinux.c index c4b33d6d..fe04063a 100644 --- a/bus/selinux.c +++ b/bus/selinux.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include <dbus/dbus-internals.h> #include <dbus/dbus-string.h> #ifndef DBUS_WIN diff --git a/bus/services.c b/bus/services.c index b260c633..0a049257 100644 --- a/bus/services.c +++ b/bus/services.c @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include <dbus/dbus-hash.h> #include <dbus/dbus-list.h> #include <dbus/dbus-mempool.h> diff --git a/bus/signals.c b/bus/signals.c index dbfbb5c2..6f97b2b3 100644 --- a/bus/signals.c +++ b/bus/signals.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "signals.h" #include "services.h" #include "utils.h" diff --git a/bus/test-launch-helper.c b/bus/test-launch-helper.c index d78ca519..ab36b6ec 100644 --- a/bus/test-launch-helper.c +++ b/bus/test-launch-helper.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "test.h" #include "activation-helper.h" diff --git a/bus/test-main.c b/bus/test-main.c index 000bdd5a..cb0ed008 100644 --- a/bus/test-main.c +++ b/bus/test-main.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "test.h" #include <stdio.h> #include <stdlib.h> diff --git a/bus/test-system.c b/bus/test-system.c index 6224ab5e..56a7d4ea 100644 --- a/bus/test-system.c +++ b/bus/test-system.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "test.h" #include <stdio.h> #include <stdlib.h> @@ -24,8 +24,6 @@ #ifndef BUS_TEST_H #define BUS_TEST_H -#include <config.h> - #ifdef DBUS_BUILD_TESTS #include <dbus/dbus.h> diff --git a/dbus/dbus-auth-script.h b/dbus/dbus-auth-script.h index 30cd5642..39e6c7c4 100644 --- a/dbus/dbus-auth-script.h +++ b/dbus/dbus-auth-script.h @@ -24,8 +24,6 @@ #ifndef DBUS_AUTH_SCRIPT_H #define DBUS_AUTH_SCRIPT_H -#include <config.h> - #include <dbus/dbus-memory.h> #include <dbus/dbus-types.h> #include <dbus/dbus-string.h> diff --git a/dbus/dbus-auth-util.c b/dbus/dbus-auth-util.c index 09ecdd47..776e8e27 100644 --- a/dbus/dbus-auth-util.c +++ b/dbus/dbus-auth-util.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "dbus-internals.h" #include "dbus-test.h" #include "dbus-auth.h" diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c index 0c124830..3173f34f 100644 --- a/dbus/dbus-auth.c +++ b/dbus/dbus-auth.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "dbus-auth.h" #include "dbus-string.h" #include "dbus-list.h" diff --git a/dbus/dbus-credentials-util.c b/dbus/dbus-credentials-util.c index dae6080d..02771966 100644 --- a/dbus/dbus-credentials-util.c +++ b/dbus/dbus-credentials-util.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "dbus-internals.h" #include "dbus-test.h" #include "dbus-credentials.h" diff --git a/dbus/dbus-dataslot.c b/dbus/dbus-dataslot.c index 8fab7bbc..fd25c416 100644 --- a/dbus/dbus-dataslot.c +++ b/dbus/dbus-dataslot.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "dbus-dataslot.h" #include "dbus-threads-internal.h" diff --git a/dbus/dbus-errors.c b/dbus/dbus-errors.c index e8154ccc..5f27501c 100644 --- a/dbus/dbus-errors.c +++ b/dbus/dbus-errors.c @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "dbus-errors.h" #include "dbus-internals.h" #include "dbus-string.h" diff --git a/dbus/dbus-file-win.c b/dbus/dbus-file-win.c index 499237ea..2dfba00f 100644 --- a/dbus/dbus-file-win.c +++ b/dbus/dbus-file-win.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "dbus-protocol.h" #include "dbus-string.h" #include "dbus-internals.h" diff --git a/dbus/dbus-hash.c b/dbus/dbus-hash.c index e9eba6e5..80a494a5 100644 --- a/dbus/dbus-hash.c +++ b/dbus/dbus-hash.c @@ -74,6 +74,7 @@ * accordance with the terms specified in this license. */ +#include <config.h> #include "dbus-hash.h" #include "dbus-internals.h" #include "dbus-mempool.h" diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c index a33d069a..1ab6731a 100644 --- a/dbus/dbus-internals.c +++ b/dbus/dbus-internals.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "dbus-internals.h" #include "dbus-protocol.h" #include "dbus-marshal-basic.h" diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h index 01f62471..2b9b562c 100644 --- a/dbus/dbus-internals.h +++ b/dbus/dbus-internals.h @@ -27,8 +27,6 @@ #ifndef DBUS_INTERNALS_H #define DBUS_INTERNALS_H -#include <config.h> - #include <dbus/dbus-memory.h> #include <dbus/dbus-types.h> #include <dbus/dbus-errors.h> diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c index 6dc1e129..031521c2 100644 --- a/dbus/dbus-keyring.c +++ b/dbus/dbus-keyring.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-keyring.h" #include "dbus-protocol.h" #include <dbus/dbus-string.h> diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c index e075ffe1..6a16ed60 100644 --- a/dbus/dbus-list.c +++ b/dbus/dbus-list.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-list.h" #include "dbus-mempool.h" diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c index a3833588..96ba599b 100644 --- a/dbus/dbus-mainloop.c +++ b/dbus/dbus-mainloop.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-mainloop.h" #ifndef DOXYGEN_SHOULD_SKIP_THIS diff --git a/dbus/dbus-marshal-basic.c b/dbus/dbus-marshal-basic.c index 00551354..1be5c7d0 100644 --- a/dbus/dbus-marshal-basic.c +++ b/dbus/dbus-marshal-basic.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-marshal-basic.h" #include "dbus-signature.h" diff --git a/dbus/dbus-marshal-basic.h b/dbus/dbus-marshal-basic.h index fd87a80f..0c27fc9e 100644 --- a/dbus/dbus-marshal-basic.h +++ b/dbus/dbus-marshal-basic.h @@ -25,8 +25,6 @@ #ifndef DBUS_MARSHAL_BASIC_H #define DBUS_MARSHAL_BASIC_H -#include <config.h> - #ifdef HAVE_BYTESWAP_H #include <byteswap.h> #endif diff --git a/dbus/dbus-marshal-byteswap.c b/dbus/dbus-marshal-byteswap.c index c5e92b32..22d7e22b 100644 --- a/dbus/dbus-marshal-byteswap.c +++ b/dbus/dbus-marshal-byteswap.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-marshal-byteswap.h" #include "dbus-marshal-basic.h" #include "dbus-signature.h" diff --git a/dbus/dbus-marshal-byteswap.h b/dbus/dbus-marshal-byteswap.h index 7c8ea7b6..be2dd758 100644 --- a/dbus/dbus-marshal-byteswap.h +++ b/dbus/dbus-marshal-byteswap.h @@ -24,7 +24,6 @@ #ifndef DBUS_MARSHAL_BYTESWAP_H #define DBUS_MARSHAL_BYTESWAP_H -#include <config.h> #include <dbus/dbus-protocol.h> #include <dbus/dbus-marshal-recursive.h> diff --git a/dbus/dbus-marshal-header.c b/dbus/dbus-marshal-header.c index d9e9bb51..3f31d7a0 100644 --- a/dbus/dbus-marshal-header.c +++ b/dbus/dbus-marshal-header.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus/dbus-shared.h" #include "dbus-marshal-header.h" #include "dbus-marshal-recursive.h" diff --git a/dbus/dbus-marshal-header.h b/dbus/dbus-marshal-header.h index 0f36efac..fd16c5f0 100644 --- a/dbus/dbus-marshal-header.h +++ b/dbus/dbus-marshal-header.h @@ -24,7 +24,6 @@ #ifndef DBUS_MARSHAL_HEADER_H #define DBUS_MARSHAL_HEADER_H -#include <config.h> #include <dbus/dbus-marshal-basic.h> #include <dbus/dbus-marshal-validate.h> diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c index ccf0d22b..cb10854b 100644 --- a/dbus/dbus-marshal-recursive.c +++ b/dbus/dbus-marshal-recursive.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-marshal-recursive.h" #include "dbus-marshal-basic.h" #include "dbus-signature.h" diff --git a/dbus/dbus-marshal-recursive.h b/dbus/dbus-marshal-recursive.h index a743668d..97e5466b 100644 --- a/dbus/dbus-marshal-recursive.h +++ b/dbus/dbus-marshal-recursive.h @@ -24,7 +24,6 @@ #ifndef DBUS_MARSHAL_RECURSIVE_H #define DBUS_MARSHAL_RECURSIVE_H -#include <config.h> #include <dbus/dbus-protocol.h> #include <dbus/dbus-list.h> diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c index bbaa9bdf..aa470fc8 100644 --- a/dbus/dbus-marshal-validate.c +++ b/dbus/dbus-marshal-validate.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-marshal-validate.h" #include "dbus-marshal-recursive.h" diff --git a/dbus/dbus-marshal-validate.h b/dbus/dbus-marshal-validate.h index 7a623d9e..5817de32 100644 --- a/dbus/dbus-marshal-validate.h +++ b/dbus/dbus-marshal-validate.h @@ -24,8 +24,6 @@ #ifndef DBUS_MARSHAL_VALIDATE_H #define DBUS_MARSHAL_VALIDATE_H -#include <config.h> - /** * @addtogroup DBusMarshal * diff --git a/dbus/dbus-md5.c b/dbus/dbus-md5.c index 8405f360..af71d5c5 100644 --- a/dbus/dbus-md5.c +++ b/dbus/dbus-md5.c @@ -34,6 +34,7 @@ * <ghost@aladdin.com>. */ +#include <config.h> #include "dbus-internals.h" #include "dbus-md5.h" #include <string.h> diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c index 0ceac666..b3ba067b 100644 --- a/dbus/dbus-memory.c +++ b/dbus/dbus-memory.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-memory.h" #include "dbus-internals.h" #include "dbus-sysdeps.h" diff --git a/dbus/dbus-mempool.c b/dbus/dbus-mempool.c index 2a41cb16..680586b7 100644 --- a/dbus/dbus-mempool.c +++ b/dbus/dbus-mempool.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-mempool.h" #include "dbus-internals.h" diff --git a/dbus/dbus-message-private.h b/dbus/dbus-message-private.h index 366c53aa..57888fa5 100644 --- a/dbus/dbus-message-private.h +++ b/dbus/dbus-message-private.h @@ -23,8 +23,6 @@ #ifndef DBUS_MESSAGE_PRIVATE_H #define DBUS_MESSAGE_PRIVATE_H -#include <config.h> - #include <dbus/dbus-message.h> #include <dbus/dbus-message-internal.h> #include <dbus/dbus-string.h> diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c index a56fcc49..94219f61 100644 --- a/dbus/dbus-message-util.c +++ b/dbus/dbus-message-util.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-test.h" #include "dbus-message-private.h" diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index 11a2eb13..3b5941b5 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-marshal-recursive.h" #include "dbus-marshal-validate.h" diff --git a/dbus/dbus-nonce.c b/dbus/dbus-nonce.c index cf1424c3..3e5070f5 100644 --- a/dbus/dbus-nonce.c +++ b/dbus/dbus-nonce.c @@ -21,6 +21,7 @@ * */ +#include <config.h> // major sections of this file are modified code from libassuan, (C) FSF #include "dbus-nonce.h" #include "dbus-internals.h" diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c index 4309d154..2f8dcbaa 100644 --- a/dbus/dbus-object-tree.c +++ b/dbus/dbus-object-tree.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "dbus-object-tree.h" #include "dbus-connection-internal.h" #include "dbus-internals.h" diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c index 43fad052..e1de656a 100644 --- a/dbus/dbus-pending-call.c +++ b/dbus/dbus-pending-call.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-connection-internal.h" #include "dbus-pending-call-internal.h" diff --git a/dbus/dbus-pipe-unix.c b/dbus/dbus-pipe-unix.c index 79a826f5..f35024b5 100644 --- a/dbus/dbus-pipe-unix.c +++ b/dbus/dbus-pipe-unix.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "dbus-protocol.h" #include "dbus-string.h" #include "dbus-internals.h" diff --git a/dbus/dbus-pipe-win.c b/dbus/dbus-pipe-win.c index 79865735..a07e572e 100644 --- a/dbus/dbus-pipe-win.c +++ b/dbus/dbus-pipe-win.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "dbus-protocol.h" #include "dbus-string.h" #include "dbus-internals.h" diff --git a/dbus/dbus-pipe.c b/dbus/dbus-pipe.c index 59cf9346..60a58b54 100644 --- a/dbus/dbus-pipe.c +++ b/dbus/dbus-pipe.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "dbus-pipe.h" /* diff --git a/dbus/dbus-pipe.h b/dbus/dbus-pipe.h index 75b7d2fe..cd575332 100644 --- a/dbus/dbus-pipe.h +++ b/dbus/dbus-pipe.h @@ -25,8 +25,6 @@ #ifndef DBUS_PIPE_H #define DBUS_PIPE_H -#include <config.h> - #include <dbus/dbus-types.h> #include <dbus/dbus-errors.h> #include <dbus/dbus-string.h> diff --git a/dbus/dbus-resources.c b/dbus/dbus-resources.c index 7c7aabd0..5f7001cc 100644 --- a/dbus/dbus-resources.c +++ b/dbus/dbus-resources.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include <dbus/dbus-resources.h> #include <dbus/dbus-internals.h> diff --git a/dbus/dbus-server-debug-pipe.c b/dbus/dbus-server-debug-pipe.c index 8ba6fb6b..e18cad71 100644 --- a/dbus/dbus-server-debug-pipe.c +++ b/dbus/dbus-server-debug-pipe.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-server-debug-pipe.h" #include "dbus-transport-socket.h" diff --git a/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h index c05d2779..20836b53 100644 --- a/dbus/dbus-server-protected.h +++ b/dbus/dbus-server-protected.h @@ -23,7 +23,6 @@ #ifndef DBUS_SERVER_PROTECTED_H #define DBUS_SERVER_PROTECTED_H -#include <config.h> #include <dbus/dbus-internals.h> #include <dbus/dbus-threads-internal.h> #include <dbus/dbus-server.h> diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c index 6a8717af..dbd72138 100644 --- a/dbus/dbus-server-socket.c +++ b/dbus/dbus-server-socket.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-server-socket.h" #include "dbus-transport-socket.h" diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c index 597d0f8e..65c9668b 100644 --- a/dbus/dbus-server-unix.c +++ b/dbus/dbus-server-unix.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-server-unix.h" #include "dbus-server-socket.h" diff --git a/dbus/dbus-server-win.c b/dbus/dbus-server-win.c index ca376692..5cfb73e7 100644 --- a/dbus/dbus-server-win.c +++ b/dbus/dbus-server-win.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-server-win.h" #include "dbus-server-socket.h" diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c index 974503bb..18fa8c4a 100644 --- a/dbus/dbus-server.c +++ b/dbus/dbus-server.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-server.h" #include "dbus-server-unix.h" #include "dbus-server-socket.h" diff --git a/dbus/dbus-sha.c b/dbus/dbus-sha.c index 04e353a0..d1827522 100644 --- a/dbus/dbus-sha.c +++ b/dbus/dbus-sha.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-sha.h" #include "dbus-marshal-basic.h" /* for byteswap routines */ diff --git a/dbus/dbus-shell.c b/dbus/dbus-shell.c index 57900d88..111d39df 100644 --- a/dbus/dbus-shell.c +++ b/dbus/dbus-shell.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include <string.h> #include "dbus-internals.h" #include "dbus-list.h" diff --git a/dbus/dbus-signature.c b/dbus/dbus-signature.c index b2d0a627..ddc0bcc3 100644 --- a/dbus/dbus-signature.c +++ b/dbus/dbus-signature.c @@ -21,6 +21,8 @@ * */ +#include <config.h> + #include "dbus-signature.h" #include "dbus-marshal-recursive.h" #include "dbus-marshal-basic.h" diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c index de077892..6b9fdf57 100644 --- a/dbus/dbus-spawn-win.c +++ b/dbus/dbus-spawn-win.c @@ -1,4 +1,4 @@ -#include "config.h" +#include <config.h> //#define SPAWN_DEBUG diff --git a/dbus/dbus-string-private.h b/dbus/dbus-string-private.h index 6687a76f..365d89a3 100644 --- a/dbus/dbus-string-private.h +++ b/dbus/dbus-string-private.h @@ -24,8 +24,6 @@ #ifndef DBUS_STRING_PRIVATE_H #define DBUS_STRING_PRIVATE_H -#include <config.h> - #include <dbus/dbus-memory.h> #include <dbus/dbus-types.h> diff --git a/dbus/dbus-string-util.c b/dbus/dbus-string-util.c index 666ffbd4..4d42bb0b 100644 --- a/dbus/dbus-string-util.c +++ b/dbus/dbus-string-util.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-string.h" #define DBUS_CAN_USE_DBUS_STRING_PRIVATE 1 diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c index 4d799f99..e2eb93b9 100644 --- a/dbus/dbus-string.c +++ b/dbus/dbus-string.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-string.h" /* we allow a system header here, for speed/convenience */ diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h index cfb6f163..2f1ed31c 100644 --- a/dbus/dbus-string.h +++ b/dbus/dbus-string.h @@ -25,8 +25,6 @@ #ifndef DBUS_STRING_H #define DBUS_STRING_H -#include <config.h> - #include <dbus/dbus-macros.h> #include <dbus/dbus-types.h> #include <dbus/dbus-memory.h> diff --git a/dbus/dbus-sysdeps-pthread.c b/dbus/dbus-sysdeps-pthread.c index 46e4204d..70737512 100644 --- a/dbus/dbus-sysdeps-pthread.c +++ b/dbus/dbus-sysdeps-pthread.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-sysdeps.h" #include "dbus-threads.h" diff --git a/dbus/dbus-sysdeps-thread-win.c b/dbus/dbus-sysdeps-thread-win.c index 4c4d22f3..55c0bf7b 100644 --- a/dbus/dbus-sysdeps-thread-win.c +++ b/dbus/dbus-sysdeps-thread-win.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-sysdeps.h" #include "dbus-sysdeps-win.h" diff --git a/dbus/dbus-sysdeps-unix.h b/dbus/dbus-sysdeps-unix.h index 96b44e29..81758e0f 100644 --- a/dbus/dbus-sysdeps-unix.h +++ b/dbus/dbus-sysdeps-unix.h @@ -25,7 +25,6 @@ #ifndef DBUS_SYSDEPS_UNIX_H #define DBUS_SYSDEPS_UNIX_H -#include <config.h> #include <dbus/dbus-sysdeps.h> #ifdef DBUS_WIN diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index eaf32703..94f580b1 100644 --- a/dbus/dbus-sysdeps-util-unix.c +++ b/dbus/dbus-sysdeps-util-unix.c @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "dbus-sysdeps.h" #include "dbus-sysdeps-unix.h" #include "dbus-internals.h" diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c index 2722b01e..7b2472f4 100644 --- a/dbus/dbus-sysdeps-util-win.c +++ b/dbus/dbus-sysdeps-util-win.c @@ -22,6 +22,8 @@ * */ +#include <config.h> + #define STRSAFE_NO_DEPRECATE #include "dbus-sysdeps.h" diff --git a/dbus/dbus-sysdeps-util.c b/dbus/dbus-sysdeps-util.c index 67e19f7b..68669cf0 100644 --- a/dbus/dbus-sysdeps-util.c +++ b/dbus/dbus-sysdeps-util.c @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "dbus-sysdeps.h" #include "dbus-internals.h" #include "dbus-string.h" diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index db149b86..bba8915f 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -26,6 +26,8 @@ * */ +#include <config.h> + #define STRSAFE_NO_DEPRECATE #ifndef DBUS_WINCE diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index c27f999e..f9c6fc55 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-sysdeps.h" #include "dbus-threads.h" diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index a656469a..bfcd0b87 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -25,8 +25,6 @@ #ifndef DBUS_SYSDEPS_H #define DBUS_SYSDEPS_H -#include <config.h> - #include <dbus/dbus-errors.h> #include <dbus/dbus-file.h> #include <dbus/dbus-string.h> diff --git a/dbus/dbus-test-main.c b/dbus/dbus-test-main.c index 1bb7c904..a8a30f31 100644 --- a/dbus/dbus-test-main.c +++ b/dbus/dbus-test-main.c @@ -22,6 +22,7 @@ */ +#include <config.h> #include "dbus-types.h" #include "dbus-test.h" #include <stdio.h> diff --git a/dbus/dbus-threads.c b/dbus/dbus-threads.c index b425ae7b..37b68ba2 100644 --- a/dbus/dbus-threads.c +++ b/dbus/dbus-threads.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ +#include <config.h> #include "dbus-threads.h" #include "dbus-internals.h" #include "dbus-threads-internal.h" diff --git a/dbus/dbus-timeout.c b/dbus/dbus-timeout.c index 0d92ca11..a1d6ce59 100644 --- a/dbus/dbus-timeout.c +++ b/dbus/dbus-timeout.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-timeout.h" #include "dbus-list.h" diff --git a/dbus/dbus-transport-protected.h b/dbus/dbus-transport-protected.h index a3c8f3e4..44b9d785 100644 --- a/dbus/dbus-transport-protected.h +++ b/dbus/dbus-transport-protected.h @@ -23,8 +23,6 @@ #ifndef DBUS_TRANSPORT_PROTECTED_H #define DBUS_TRANSPORT_PROTECTED_H -#include <config.h> - #include <dbus/dbus-internals.h> #include <dbus/dbus-errors.h> #include <dbus/dbus-transport.h> diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c index 4f8c6cfc..849a1077 100644 --- a/dbus/dbus-transport-socket.c +++ b/dbus/dbus-transport-socket.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-connection-internal.h" #include "dbus-nonce.h" diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c index 2f2a3da5..6a713d10 100644 --- a/dbus/dbus-transport-unix.c +++ b/dbus/dbus-transport-unix.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-connection-internal.h" #include "dbus-transport-unix.h" diff --git a/dbus/dbus-transport-win.c b/dbus/dbus-transport-win.c index 1545c717..faaf1bd2 100644 --- a/dbus/dbus-transport-win.c +++ b/dbus/dbus-transport-win.c @@ -22,6 +22,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-connection-internal.h" #include "dbus-transport-socket.h" diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c index d8f34eef..bec4a5ac 100644 --- a/dbus/dbus-transport.c +++ b/dbus/dbus-transport.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-transport-protected.h" #include "dbus-transport-unix.h" #include "dbus-transport-socket.h" diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c index f75d1bc0..8679f740 100644 --- a/dbus/dbus-userdb-util.c +++ b/dbus/dbus-userdb-util.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ +#include <config.h> #define DBUS_USERDB_INCLUDES_PRIVATE 1 #include "dbus-userdb.h" #include "dbus-test.h" diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c index bfa4c435..4a317bab 100644 --- a/dbus/dbus-userdb.c +++ b/dbus/dbus-userdb.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ +#include <config.h> #define DBUS_USERDB_INCLUDES_PRIVATE 1 #include "dbus-userdb.h" #include "dbus-hash.h" diff --git a/dbus/dbus-uuidgen.c b/dbus/dbus-uuidgen.c index 5c571e88..6d7c0aec 100644 --- a/dbus/dbus-uuidgen.c +++ b/dbus/dbus-uuidgen.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ +#include <config.h> #include "dbus-uuidgen.h" #include "dbus-internals.h" #include "dbus-string.h" diff --git a/dbus/dbus-watch.c b/dbus/dbus-watch.c index 484dbbe6..bd5ca8ff 100644 --- a/dbus/dbus-watch.c +++ b/dbus/dbus-watch.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include "dbus-internals.h" #include "dbus-watch.h" #include "dbus-list.h" diff --git a/test/break-loader.c b/test/break-loader.c index 8ed44320..f85bd207 100644 --- a/test/break-loader.c +++ b/test/break-loader.c @@ -21,6 +21,7 @@ * */ +#include <config.h> #include <dbus/dbus.h> #include <sys/stat.h> #include <sys/types.h> diff --git a/test/decode-gcov.c b/test/decode-gcov.c index f26afd3e..3b2a1522 100644 --- a/test/decode-gcov.c +++ b/test/decode-gcov.c @@ -27,6 +27,7 @@ * */ +#include <config.h> #define DBUS_COMPILATION /* cheat */ #include <dbus/dbus-list.h> #include <dbus/dbus-string.h> diff --git a/test/name-test/test-ids.c b/test/name-test/test-ids.c index f08d4ac9..8f63d044 100644 --- a/test/name-test/test-ids.c +++ b/test/name-test/test-ids.c @@ -1,3 +1,4 @@ +#include <config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/test/name-test/test-names.c b/test/name-test/test-names.c index b09f3638..daf45360 100644 --- a/test/name-test/test-names.c +++ b/test/name-test/test-names.c @@ -1,3 +1,4 @@ +#include <config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/test/name-test/test-pending-call-dispatch.c b/test/name-test/test-pending-call-dispatch.c index 54726498..57582d49 100644 --- a/test/name-test/test-pending-call-dispatch.c +++ b/test/name-test/test-pending-call-dispatch.c @@ -7,6 +7,7 @@ * and blocking. **/ +#include <config.h> #include <dbus/dbus.h> #include <dbus/dbus-sysdeps.h> #include <stdio.h> diff --git a/test/name-test/test-pending-call-timeout.c b/test/name-test/test-pending-call-timeout.c index 53a0c3a7..381113bd 100644 --- a/test/name-test/test-pending-call-timeout.c +++ b/test/name-test/test-pending-call-timeout.c @@ -3,6 +3,7 @@ * specific and infinite timeout. **/ +#include <config.h> #include <dbus/dbus.h> #include <dbus/dbus-sysdeps.h> #include <stdio.h> diff --git a/test/name-test/test-privserver-client.c b/test/name-test/test-privserver-client.c index 5af470ae..d02eea89 100644 --- a/test/name-test/test-privserver-client.c +++ b/test/name-test/test-privserver-client.c @@ -1,3 +1,4 @@ +#include <config.h> #include "../test-utils.h" static void diff --git a/test/name-test/test-privserver.c b/test/name-test/test-privserver.c index c814001c..100e0cf2 100644 --- a/test/name-test/test-privserver.c +++ b/test/name-test/test-privserver.c @@ -1,3 +1,4 @@ +#include <config.h> #include "../test-utils.h" static void diff --git a/test/name-test/test-shutdown.c b/test/name-test/test-shutdown.c index e76c1ea2..526c1cbc 100644 --- a/test/name-test/test-shutdown.c +++ b/test/name-test/test-shutdown.c @@ -1,4 +1,5 @@ +#include <config.h> #include "../test-utils.h" static DBusLoop *loop; diff --git a/test/name-test/test-threads-init.c b/test/name-test/test-threads-init.c index 8cda413c..5e22852a 100644 --- a/test/name-test/test-threads-init.c +++ b/test/name-test/test-threads-init.c @@ -2,6 +2,7 @@ * Test to make sure late thread initialization works */ +#include <config.h> #include <dbus/dbus.h> #include <dbus/dbus-sysdeps.h> #include <stdio.h> diff --git a/test/shell-test.c b/test/shell-test.c index c0134677..b479a9c6 100644 --- a/test/shell-test.c +++ b/test/shell-test.c @@ -1,3 +1,4 @@ +#include <config.h> #include <stdio.h> #include <stdlib.h> #define DBUS_COMPILATION diff --git a/test/spawn-test.c b/test/spawn-test.c index 68bd3331..f1a55051 100644 --- a/test/spawn-test.c +++ b/test/spawn-test.c @@ -1,3 +1,4 @@ +#include <config.h> #include <dbus/dbus.h> #define DBUS_COMPILATION /* cheat and use dbus-sysdeps */ diff --git a/test/test-exit.c b/test/test-exit.c index abb95865..f3358185 100644 --- a/test/test-exit.c +++ b/test/test-exit.c @@ -1,5 +1,4 @@ /* This is a process that just exits with a failure code */ - int main (int argc, char **argv) { diff --git a/test/test-names.c b/test/test-names.c index e618e99b..27366350 100644 --- a/test/test-names.c +++ b/test/test-names.c @@ -1,4 +1,4 @@ - +#include <config.h> #include "test-utils.h" static DBusLoop *loop; diff --git a/test/test-service.c b/test/test-service.c index 93f59f1e..6627ea75 100644 --- a/test/test-service.c +++ b/test/test-service.c @@ -1,3 +1,4 @@ +#include <config.h> #include "test-utils.h" #ifdef HAVE_UNISTD_H diff --git a/test/test-shell-service.c b/test/test-shell-service.c index 21801c7b..57c16123 100644 --- a/test/test-shell-service.c +++ b/test/test-shell-service.c @@ -1,3 +1,4 @@ +#include <config.h> #include "test-utils.h" diff --git a/test/test-utils.c b/test/test-utils.c index d875cc95..eda20cd5 100644 --- a/test/test-utils.c +++ b/test/test-utils.c @@ -1,3 +1,4 @@ +#include <config.h> #include "test-utils.h" typedef struct diff --git a/test/test-utils.h b/test/test-utils.h index 90d87767..3e1e55e6 100644 --- a/test/test-utils.h +++ b/test/test-utils.h @@ -1,6 +1,5 @@ #ifndef TEST_UTILS_H #define TEST_UTILS_H -#include <config.h> #ifndef DBUS_COMPILATION #define DBUS_COMPILATION /* Cheat and use private stuff */ #endif diff --git a/tools/dbus-launch-x11.c b/tools/dbus-launch-x11.c index 43de6d75..fe492227 100644 --- a/tools/dbus-launch-x11.c +++ b/tools/dbus-launch-x11.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "dbus-launch.h" #ifdef DBUS_BUILD_X11 diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c index d3553e81..ec4c9a5a 100644 --- a/tools/dbus-launch.c +++ b/tools/dbus-launch.c @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "dbus-launch.h" #include <stdlib.h> #include <ctype.h> diff --git a/tools/dbus-launch.h b/tools/dbus-launch.h index d0d0617d..8220bb8e 100644 --- a/tools/dbus-launch.h +++ b/tools/dbus-launch.h @@ -24,7 +24,6 @@ #ifndef DBUS_LAUNCH_H #define DBUS_LAUNCH_H -#include <config.h> #include <sys/types.h> #ifndef TRUE diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c index 8a8e351d..b7c3f098 100644 --- a/tools/dbus-print-message.c +++ b/tools/dbus-print-message.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include <config.h> #include "dbus-print-message.h" #include <stdlib.h> |