From 6590e1c30a54a2acd5e80c9a9cd96d267f5d17de Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Fri, 19 Mar 2010 12:36:49 +0100 Subject: [PATCH 1/3] Consistently include in all C source files and never in header files. --- bus/activation.c | 2 ++ bus/bus.c | 1 + bus/bus.h | 2 -- bus/config-loader-expat.c | 1 + bus/config-loader-libxml.c | 1 + bus/config-parser-common.c | 1 + bus/config-parser-common.h | 2 -- bus/config-parser-trivial.c | 1 + bus/config-parser-trivial.h | 2 -- bus/config-parser.c | 2 ++ bus/config-parser.h | 2 -- bus/connection.c | 2 ++ bus/desktop-file.c | 2 ++ bus/dispatch.c | 1 + bus/driver.c | 1 + bus/expirelist.c | 1 + bus/main.c | 2 ++ bus/policy.c | 1 + bus/selinux.c | 2 ++ bus/services.c | 2 ++ bus/signals.c | 2 ++ bus/test-launch-helper.c | 1 + bus/test-main.c | 1 + bus/test-system.c | 1 + bus/test.h | 2 -- dbus/dbus-auth-script.h | 2 -- dbus/dbus-auth-util.c | 2 ++ dbus/dbus-auth.c | 2 ++ dbus/dbus-credentials-util.c | 2 ++ dbus/dbus-dataslot.c | 2 ++ dbus/dbus-errors.c | 2 ++ dbus/dbus-file-win.c | 1 + dbus/dbus-hash.c | 1 + dbus/dbus-internals.c | 2 ++ dbus/dbus-internals.h | 2 -- dbus/dbus-keyring.c | 1 + dbus/dbus-list.c | 1 + dbus/dbus-mainloop.c | 1 + dbus/dbus-marshal-basic.c | 1 + dbus/dbus-marshal-basic.h | 2 -- dbus/dbus-marshal-byteswap.c | 1 + dbus/dbus-marshal-byteswap.h | 1 - dbus/dbus-marshal-header.c | 1 + dbus/dbus-marshal-header.h | 1 - dbus/dbus-marshal-recursive.c | 1 + dbus/dbus-marshal-recursive.h | 1 - dbus/dbus-marshal-validate.c | 1 + dbus/dbus-marshal-validate.h | 2 -- dbus/dbus-md5.c | 1 + dbus/dbus-memory.c | 1 + dbus/dbus-mempool.c | 1 + dbus/dbus-message-private.h | 2 -- dbus/dbus-message-util.c | 1 + dbus/dbus-message.c | 1 + dbus/dbus-nonce.c | 1 + dbus/dbus-object-tree.c | 2 ++ dbus/dbus-pending-call.c | 1 + dbus/dbus-pipe-unix.c | 1 + dbus/dbus-pipe-win.c | 1 + dbus/dbus-pipe.c | 1 + dbus/dbus-pipe.h | 2 -- dbus/dbus-resources.c | 2 ++ dbus/dbus-server-debug-pipe.c | 1 + dbus/dbus-server-protected.h | 1 - dbus/dbus-server-socket.c | 1 + dbus/dbus-server-unix.c | 1 + dbus/dbus-server-win.c | 1 + dbus/dbus-server.c | 1 + dbus/dbus-sha.c | 1 + dbus/dbus-shell.c | 1 + dbus/dbus-signature.c | 2 ++ dbus/dbus-spawn-win.c | 2 +- dbus/dbus-string-private.h | 2 -- dbus/dbus-string-util.c | 1 + dbus/dbus-string.c | 1 + dbus/dbus-string.h | 2 -- dbus/dbus-sysdeps-pthread.c | 1 + dbus/dbus-sysdeps-thread-win.c | 1 + dbus/dbus-sysdeps-unix.h | 1 - dbus/dbus-sysdeps-util-unix.c | 2 ++ dbus/dbus-sysdeps-util-win.c | 2 ++ dbus/dbus-sysdeps-util.c | 2 ++ dbus/dbus-sysdeps-win.c | 2 ++ dbus/dbus-sysdeps-wince-glue.c | 1 + dbus/dbus-sysdeps.c | 1 + dbus/dbus-sysdeps.h | 2 -- dbus/dbus-test-main.c | 1 + dbus/dbus-threads.c | 1 + dbus/dbus-timeout.c | 1 + dbus/dbus-transport-protected.h | 2 -- dbus/dbus-transport-socket.c | 1 + dbus/dbus-transport-unix.c | 1 + dbus/dbus-transport-win.c | 1 + dbus/dbus-transport.c | 1 + dbus/dbus-userdb-util.c | 1 + dbus/dbus-userdb.c | 1 + dbus/dbus-uuidgen.c | 1 + dbus/dbus-watch.c | 1 + test/break-loader.c | 1 + test/decode-gcov.c | 1 + test/name-test/test-ids.c | 1 + test/name-test/test-names.c | 1 + test/name-test/test-pending-call-dispatch.c | 1 + test/name-test/test-pending-call-timeout.c | 1 + test/name-test/test-privserver-client.c | 1 + test/name-test/test-privserver.c | 1 + test/name-test/test-shutdown.c | 1 + test/name-test/test-threads-init.c | 1 + test/shell-test.c | 1 + test/spawn-test.c | 1 + test/test-exit.c | 1 - test/test-names.c | 2 +- test/test-service.c | 1 + test/test-shell-service.c | 1 + test/test-utils.c | 1 + test/test-utils.h | 1 - tools/dbus-launch-x11.c | 2 ++ tools/dbus-launch.c | 2 ++ tools/dbus-launch.h | 1 - tools/dbus-print-message.c | 2 ++ 120 files changed, 121 insertions(+), 40 deletions(-) diff --git a/bus/activation.c b/bus/activation.c index 0a28df1..1ba7b17 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 #include "activation.h" #include "activation-exit-codes.h" #include "desktop-file.h" diff --git a/bus/bus.c b/bus/bus.c index 3777796..81d69b5 100644 --- a/bus/bus.c +++ b/bus/bus.c @@ -21,6 +21,7 @@ * */ +#include #include "bus.h" #include "activation.h" #include "connection.h" diff --git a/bus/bus.h b/bus/bus.h index 14a809b..7eb5fd8 100644 --- a/bus/bus.h +++ b/bus/bus.h @@ -24,8 +24,6 @@ #ifndef BUS_BUS_H #define BUS_BUS_H -#include - #include #include #include diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c index c0620ae..51bbb51 100644 --- a/bus/config-loader-expat.c +++ b/bus/config-loader-expat.c @@ -21,6 +21,7 @@ * */ +#include #include "config-parser.h" #include #include diff --git a/bus/config-loader-libxml.c b/bus/config-loader-libxml.c index 3d82a63..c73a181 100644 --- a/bus/config-loader-libxml.c +++ b/bus/config-loader-libxml.c @@ -21,6 +21,7 @@ * */ +#include #include "config-parser.h" #include #include diff --git a/bus/config-parser-common.c b/bus/config-parser-common.c index ebcb717..f8d75be 100644 --- a/bus/config-parser-common.c +++ b/bus/config-parser-common.c @@ -21,6 +21,7 @@ * */ +#include #include #include diff --git a/bus/config-parser-common.h b/bus/config-parser-common.h index dc0e0ed..da74560 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 - typedef enum { ELEMENT_NONE, diff --git a/bus/config-parser-trivial.c b/bus/config-parser-trivial.c index fd016a8..a35226a 100644 --- a/bus/config-parser-trivial.c +++ b/bus/config-parser-trivial.c @@ -22,6 +22,7 @@ * */ +#include #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 ce542bf..70e5d5b 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 - #include #include #include diff --git a/bus/config-parser.c b/bus/config-parser.c index d8ae459..2d19f2b 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 #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 3aac1ed..ba5bf74 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 - #include #include #include diff --git a/bus/connection.c b/bus/connection.c index 50807f1..b2d6aa5 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 #include "connection.h" #include "dispatch.h" #include "policy.h" diff --git a/bus/desktop-file.c b/bus/desktop-file.c index 9f88d6e..ae441c5 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 #include #include #include "desktop-file.h" diff --git a/bus/dispatch.c b/bus/dispatch.c index 9b5e65a..dd75c8f 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -23,6 +23,7 @@ * */ +#include #include "dispatch.h" #include "connection.h" #include "driver.h" diff --git a/bus/driver.c b/bus/driver.c index 5e8a7a2..0dcfdaa 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -22,6 +22,7 @@ * */ +#include #include "activation.h" #include "connection.h" #include "driver.h" diff --git a/bus/expirelist.c b/bus/expirelist.c index 58e1f6d..d957536 100644 --- a/bus/expirelist.c +++ b/bus/expirelist.c @@ -21,6 +21,7 @@ * */ +#include #include "expirelist.h" #include "test.h" #include diff --git a/bus/main.c b/bus/main.c index c6516be..24bc905 100644 --- a/bus/main.c +++ b/bus/main.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include #include "bus.h" #include "driver.h" #include diff --git a/bus/policy.c b/bus/policy.c index bc1d2d9..27c89ac 100644 --- a/bus/policy.c +++ b/bus/policy.c @@ -21,6 +21,7 @@ * */ +#include #include "policy.h" #include "services.h" #include "test.h" diff --git a/bus/selinux.c b/bus/selinux.c index c4b33d6..fe04063 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 #include #include #ifndef DBUS_WIN diff --git a/bus/services.c b/bus/services.c index b260c63..0a04925 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 #include #include #include diff --git a/bus/signals.c b/bus/signals.c index dbfbb5c..6f97b2b 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 #include "signals.h" #include "services.h" #include "utils.h" diff --git a/bus/test-launch-helper.c b/bus/test-launch-helper.c index d78ca51..ab36b6e 100644 --- a/bus/test-launch-helper.c +++ b/bus/test-launch-helper.c @@ -21,6 +21,7 @@ * */ +#include #include "test.h" #include "activation-helper.h" diff --git a/bus/test-main.c b/bus/test-main.c index 000bdd5..cb0ed00 100644 --- a/bus/test-main.c +++ b/bus/test-main.c @@ -21,6 +21,7 @@ * */ +#include #include "test.h" #include #include diff --git a/bus/test-system.c b/bus/test-system.c index 6224ab5..56a7d4e 100644 --- a/bus/test-system.c +++ b/bus/test-system.c @@ -21,6 +21,7 @@ * */ +#include #include "test.h" #include #include diff --git a/bus/test.h b/bus/test.h index 090768c..45024e6 100644 --- a/bus/test.h +++ b/bus/test.h @@ -24,8 +24,6 @@ #ifndef BUS_TEST_H #define BUS_TEST_H -#include - #ifdef DBUS_BUILD_TESTS #include diff --git a/dbus/dbus-auth-script.h b/dbus/dbus-auth-script.h index 30cd564..39e6c7c 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 - #include #include #include diff --git a/dbus/dbus-auth-util.c b/dbus/dbus-auth-util.c index 09ecdd4..776e8e2 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 #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 0c12483..3173f34 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 #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 dae6080..0277196 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 #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 8fab7bb..fd25c41 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 #include "dbus-dataslot.h" #include "dbus-threads-internal.h" diff --git a/dbus/dbus-errors.c b/dbus/dbus-errors.c index e8154cc..5f27501 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 #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 129bf5d..d1a81e2 100644 --- a/dbus/dbus-file-win.c +++ b/dbus/dbus-file-win.c @@ -22,6 +22,7 @@ * */ +#include #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 e9eba6e..80a494a 100644 --- a/dbus/dbus-hash.c +++ b/dbus/dbus-hash.c @@ -74,6 +74,7 @@ * accordance with the terms specified in this license. */ +#include #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 a33d069..1ab6731 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 #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 01f6247..2b9b562 100644 --- a/dbus/dbus-internals.h +++ b/dbus/dbus-internals.h @@ -27,8 +27,6 @@ #ifndef DBUS_INTERNALS_H #define DBUS_INTERNALS_H -#include - #include #include #include diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c index 6dc1e12..031521c 100644 --- a/dbus/dbus-keyring.c +++ b/dbus/dbus-keyring.c @@ -21,6 +21,7 @@ * */ +#include #include "dbus-keyring.h" #include "dbus-protocol.h" #include diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c index e075ffe..6a16ed6 100644 --- a/dbus/dbus-list.c +++ b/dbus/dbus-list.c @@ -21,6 +21,7 @@ * */ +#include #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 a383358..96ba599 100644 --- a/dbus/dbus-mainloop.c +++ b/dbus/dbus-mainloop.c @@ -21,6 +21,7 @@ * */ +#include #include "dbus-mainloop.h" #ifndef DOXYGEN_SHOULD_SKIP_THIS diff --git a/dbus/dbus-marshal-basic.c b/dbus/dbus-marshal-basic.c index 0055135..1be5c7d 100644 --- a/dbus/dbus-marshal-basic.c +++ b/dbus/dbus-marshal-basic.c @@ -22,6 +22,7 @@ * */ +#include #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 fd87a80..0c27fc9 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 - #ifdef HAVE_BYTESWAP_H #include #endif diff --git a/dbus/dbus-marshal-byteswap.c b/dbus/dbus-marshal-byteswap.c index c5e92b3..22d7e22 100644 --- a/dbus/dbus-marshal-byteswap.c +++ b/dbus/dbus-marshal-byteswap.c @@ -21,6 +21,7 @@ * */ +#include #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 7c8ea7b..be2dd75 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 #include #include diff --git a/dbus/dbus-marshal-header.c b/dbus/dbus-marshal-header.c index d9e9bb5..3f31d7a 100644 --- a/dbus/dbus-marshal-header.c +++ b/dbus/dbus-marshal-header.c @@ -21,6 +21,7 @@ * */ +#include #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 0f36efa..fd16c5f 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 #include #include diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c index ccf0d22..cb10854 100644 --- a/dbus/dbus-marshal-recursive.c +++ b/dbus/dbus-marshal-recursive.c @@ -21,6 +21,7 @@ * */ +#include #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 a743668..97e5466 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 #include #include diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c index bbaa9bd..aa470fc 100644 --- a/dbus/dbus-marshal-validate.c +++ b/dbus/dbus-marshal-validate.c @@ -21,6 +21,7 @@ * */ +#include #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 7a623d9..5817de3 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 - /** * @addtogroup DBusMarshal * diff --git a/dbus/dbus-md5.c b/dbus/dbus-md5.c index 8405f36..af71d5c 100644 --- a/dbus/dbus-md5.c +++ b/dbus/dbus-md5.c @@ -34,6 +34,7 @@ * . */ +#include #include "dbus-internals.h" #include "dbus-md5.h" #include diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c index 0ceac66..b3ba067 100644 --- a/dbus/dbus-memory.c +++ b/dbus/dbus-memory.c @@ -21,6 +21,7 @@ * */ +#include #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 2a41cb1..680586b 100644 --- a/dbus/dbus-mempool.c +++ b/dbus/dbus-mempool.c @@ -21,6 +21,7 @@ * */ +#include #include "dbus-mempool.h" #include "dbus-internals.h" diff --git a/dbus/dbus-message-private.h b/dbus/dbus-message-private.h index 366c53a..57888fa 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 - #include #include #include diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c index a56fcc4..94219f6 100644 --- a/dbus/dbus-message-util.c +++ b/dbus/dbus-message-util.c @@ -22,6 +22,7 @@ * */ +#include #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 11a2eb1..3b5941b 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -22,6 +22,7 @@ * */ +#include #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 fd17c67..5143939 100644 --- a/dbus/dbus-nonce.c +++ b/dbus/dbus-nonce.c @@ -21,6 +21,7 @@ * */ +#include // 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 4309d15..2f8dcba 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 #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 43fad05..e1de656 100644 --- a/dbus/dbus-pending-call.c +++ b/dbus/dbus-pending-call.c @@ -21,6 +21,7 @@ * */ +#include #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 79a826f..f35024b 100644 --- a/dbus/dbus-pipe-unix.c +++ b/dbus/dbus-pipe-unix.c @@ -22,6 +22,7 @@ * */ +#include #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 6c4d66a..ce85e73 100644 --- a/dbus/dbus-pipe-win.c +++ b/dbus/dbus-pipe-win.c @@ -22,6 +22,7 @@ * */ +#include #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 59cf934..60a58b5 100644 --- a/dbus/dbus-pipe.c +++ b/dbus/dbus-pipe.c @@ -22,6 +22,7 @@ * */ +#include #include "dbus-pipe.h" /* diff --git a/dbus/dbus-pipe.h b/dbus/dbus-pipe.h index 75b7d2f..cd57533 100644 --- a/dbus/dbus-pipe.h +++ b/dbus/dbus-pipe.h @@ -25,8 +25,6 @@ #ifndef DBUS_PIPE_H #define DBUS_PIPE_H -#include - #include #include #include diff --git a/dbus/dbus-resources.c b/dbus/dbus-resources.c index 7c7aabd..5f7001c 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 #include #include diff --git a/dbus/dbus-server-debug-pipe.c b/dbus/dbus-server-debug-pipe.c index 8ba6fb6..e18cad7 100644 --- a/dbus/dbus-server-debug-pipe.c +++ b/dbus/dbus-server-debug-pipe.c @@ -22,6 +22,7 @@ * */ +#include #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 c05d277..20836b5 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 #include #include #include diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c index 6a8717a..dbd7213 100644 --- a/dbus/dbus-server-socket.c +++ b/dbus/dbus-server-socket.c @@ -21,6 +21,7 @@ * */ +#include #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 597d0f8..65c9668 100644 --- a/dbus/dbus-server-unix.c +++ b/dbus/dbus-server-unix.c @@ -21,6 +21,7 @@ * */ +#include #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 ca37669..5cfb73e 100644 --- a/dbus/dbus-server-win.c +++ b/dbus/dbus-server-win.c @@ -22,6 +22,7 @@ * */ +#include #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 974503b..18fa8c4 100644 --- a/dbus/dbus-server.c +++ b/dbus/dbus-server.c @@ -21,6 +21,7 @@ * */ +#include #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 04e353a..d182752 100644 --- a/dbus/dbus-sha.c +++ b/dbus/dbus-sha.c @@ -22,6 +22,7 @@ * */ +#include #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 57900d8..111d39d 100644 --- a/dbus/dbus-shell.c +++ b/dbus/dbus-shell.c @@ -22,6 +22,7 @@ * */ +#include #include #include "dbus-internals.h" #include "dbus-list.h" diff --git a/dbus/dbus-signature.c b/dbus/dbus-signature.c index b2d0a62..ddc0bcc 100644 --- a/dbus/dbus-signature.c +++ b/dbus/dbus-signature.c @@ -21,6 +21,8 @@ * */ +#include + #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 448bb0c..b17a6f1 100644 --- a/dbus/dbus-spawn-win.c +++ b/dbus/dbus-spawn-win.c @@ -1,4 +1,4 @@ -#include "config.h" +#include //#define SPAWN_DEBUG diff --git a/dbus/dbus-string-private.h b/dbus/dbus-string-private.h index 6687a76..365d89a 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 - #include #include diff --git a/dbus/dbus-string-util.c b/dbus/dbus-string-util.c index 666ffbd..4d42bb0 100644 --- a/dbus/dbus-string-util.c +++ b/dbus/dbus-string-util.c @@ -22,6 +22,7 @@ * */ +#include #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 4d799f9..e2eb93b 100644 --- a/dbus/dbus-string.c +++ b/dbus/dbus-string.c @@ -22,6 +22,7 @@ * */ +#include #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 cfb6f16..2f1ed31 100644 --- a/dbus/dbus-string.h +++ b/dbus/dbus-string.h @@ -25,8 +25,6 @@ #ifndef DBUS_STRING_H #define DBUS_STRING_H -#include - #include #include #include diff --git a/dbus/dbus-sysdeps-pthread.c b/dbus/dbus-sysdeps-pthread.c index 46e4204..7073751 100644 --- a/dbus/dbus-sysdeps-pthread.c +++ b/dbus/dbus-sysdeps-pthread.c @@ -21,6 +21,7 @@ * */ +#include #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 4c4d22f..55c0bf7 100644 --- a/dbus/dbus-sysdeps-thread-win.c +++ b/dbus/dbus-sysdeps-thread-win.c @@ -21,6 +21,7 @@ * */ +#include #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 96b44e2..81758e0 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 #include #ifdef DBUS_WIN diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index eaf3270..94f580b 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 #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 e8961b7..5b2c29c 100644 --- a/dbus/dbus-sysdeps-util-win.c +++ b/dbus/dbus-sysdeps-util-win.c @@ -22,6 +22,8 @@ * */ +#include + #define STRSAFE_NO_DEPRECATE #include "dbus-sysdeps.h" diff --git a/dbus/dbus-sysdeps-util.c b/dbus/dbus-sysdeps-util.c index 67e19f7..68669cf 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 #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 c8c7482..174b8a1 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -26,6 +26,8 @@ * */ +#include + #define STRSAFE_NO_DEPRECATE #ifndef DBUS_WINCE diff --git a/dbus/dbus-sysdeps-wince-glue.c b/dbus/dbus-sysdeps-wince-glue.c index 38b59c6..204e719 100644 --- a/dbus/dbus-sysdeps-wince-glue.c +++ b/dbus/dbus-sysdeps-wince-glue.c @@ -26,6 +26,7 @@ * */ +#include #include "dbus-internals.h" #include "dbus-sysdeps.h" #include "dbus-sysdeps-win.h" diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index bdf33c5..2132c34 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -22,6 +22,7 @@ * */ +#include #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 3d7dbb3..4db211f 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -25,8 +25,6 @@ #ifndef DBUS_SYSDEPS_H #define DBUS_SYSDEPS_H -#include - #include #include #include diff --git a/dbus/dbus-test-main.c b/dbus/dbus-test-main.c index 2e3214b..b04bebc 100644 --- a/dbus/dbus-test-main.c +++ b/dbus/dbus-test-main.c @@ -22,6 +22,7 @@ */ +#include #include "dbus-types.h" #include "dbus-test.h" #include diff --git a/dbus/dbus-threads.c b/dbus/dbus-threads.c index b425ae7..37b68ba 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 #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 0d92ca1..a1d6ce5 100644 --- a/dbus/dbus-timeout.c +++ b/dbus/dbus-timeout.c @@ -21,6 +21,7 @@ * */ +#include #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 a3c8f3e..44b9d78 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 - #include #include #include diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c index 4f8c6cf..849a107 100644 --- a/dbus/dbus-transport-socket.c +++ b/dbus/dbus-transport-socket.c @@ -21,6 +21,7 @@ * */ +#include #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 2f2a3da..6a713d1 100644 --- a/dbus/dbus-transport-unix.c +++ b/dbus/dbus-transport-unix.c @@ -21,6 +21,7 @@ * */ +#include #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 1545c71..faaf1bd 100644 --- a/dbus/dbus-transport-win.c +++ b/dbus/dbus-transport-win.c @@ -22,6 +22,7 @@ * */ +#include #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 d8f34ee..bec4a5a 100644 --- a/dbus/dbus-transport.c +++ b/dbus/dbus-transport.c @@ -21,6 +21,7 @@ * */ +#include #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 f75d1bc..8679f74 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 #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 bfa4c43..4a317ba 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 #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 5c571e8..6d7c0ae 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 #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 484dbbe..bd5ca8f 100644 --- a/dbus/dbus-watch.c +++ b/dbus/dbus-watch.c @@ -21,6 +21,7 @@ * */ +#include #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 8ed4432..f85bd20 100644 --- a/test/break-loader.c +++ b/test/break-loader.c @@ -21,6 +21,7 @@ * */ +#include #include #include #include diff --git a/test/decode-gcov.c b/test/decode-gcov.c index f26afd3..3b2a152 100644 --- a/test/decode-gcov.c +++ b/test/decode-gcov.c @@ -27,6 +27,7 @@ * */ +#include #define DBUS_COMPILATION /* cheat */ #include #include diff --git a/test/name-test/test-ids.c b/test/name-test/test-ids.c index f08d4ac..8f63d04 100644 --- a/test/name-test/test-ids.c +++ b/test/name-test/test-ids.c @@ -1,3 +1,4 @@ +#include #include #include #include diff --git a/test/name-test/test-names.c b/test/name-test/test-names.c index b09f363..daf4536 100644 --- a/test/name-test/test-names.c +++ b/test/name-test/test-names.c @@ -1,3 +1,4 @@ +#include #include #include #include diff --git a/test/name-test/test-pending-call-dispatch.c b/test/name-test/test-pending-call-dispatch.c index 5472649..57582d4 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 #include #include #include diff --git a/test/name-test/test-pending-call-timeout.c b/test/name-test/test-pending-call-timeout.c index 53a0c3a..381113b 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 #include #include #include diff --git a/test/name-test/test-privserver-client.c b/test/name-test/test-privserver-client.c index 5af470a..d02eea8 100644 --- a/test/name-test/test-privserver-client.c +++ b/test/name-test/test-privserver-client.c @@ -1,3 +1,4 @@ +#include #include "../test-utils.h" static void diff --git a/test/name-test/test-privserver.c b/test/name-test/test-privserver.c index c814001..100e0cf 100644 --- a/test/name-test/test-privserver.c +++ b/test/name-test/test-privserver.c @@ -1,3 +1,4 @@ +#include #include "../test-utils.h" static void diff --git a/test/name-test/test-shutdown.c b/test/name-test/test-shutdown.c index e76c1ea..526c1cb 100644 --- a/test/name-test/test-shutdown.c +++ b/test/name-test/test-shutdown.c @@ -1,4 +1,5 @@ +#include #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 8cda413..5e22852 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 #include #include #include diff --git a/test/shell-test.c b/test/shell-test.c index c013467..b479a9c 100644 --- a/test/shell-test.c +++ b/test/shell-test.c @@ -1,3 +1,4 @@ +#include #include #include #define DBUS_COMPILATION diff --git a/test/spawn-test.c b/test/spawn-test.c index 68bd333..f1a5505 100644 --- a/test/spawn-test.c +++ b/test/spawn-test.c @@ -1,3 +1,4 @@ +#include #include #define DBUS_COMPILATION /* cheat and use dbus-sysdeps */ diff --git a/test/test-exit.c b/test/test-exit.c index abb9586..f335818 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 e618e99..2736635 100644 --- a/test/test-names.c +++ b/test/test-names.c @@ -1,4 +1,4 @@ - +#include #include "test-utils.h" static DBusLoop *loop; diff --git a/test/test-service.c b/test/test-service.c index 93f59f1..6627ea7 100644 --- a/test/test-service.c +++ b/test/test-service.c @@ -1,3 +1,4 @@ +#include #include "test-utils.h" #ifdef HAVE_UNISTD_H diff --git a/test/test-shell-service.c b/test/test-shell-service.c index 21801c7..57c1612 100644 --- a/test/test-shell-service.c +++ b/test/test-shell-service.c @@ -1,3 +1,4 @@ +#include #include "test-utils.h" diff --git a/test/test-utils.c b/test/test-utils.c index d875cc9..eda20cd 100644 --- a/test/test-utils.c +++ b/test/test-utils.c @@ -1,3 +1,4 @@ +#include #include "test-utils.h" typedef struct diff --git a/test/test-utils.h b/test/test-utils.h index 90d8776..3e1e55e 100644 --- a/test/test-utils.h +++ b/test/test-utils.h @@ -1,6 +1,5 @@ #ifndef TEST_UTILS_H #define TEST_UTILS_H -#include #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 43de6d7..fe49222 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 #include "dbus-launch.h" #ifdef DBUS_BUILD_X11 diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c index d3553e8..ec4c9a5 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 #include "dbus-launch.h" #include #include diff --git a/tools/dbus-launch.h b/tools/dbus-launch.h index d0d0617..8220bb8 100644 --- a/tools/dbus-launch.h +++ b/tools/dbus-launch.h @@ -24,7 +24,6 @@ #ifndef DBUS_LAUNCH_H #define DBUS_LAUNCH_H -#include #include #ifndef TRUE diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c index 8a8e351..b7c3f09 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 #include "dbus-print-message.h" #include -- 1.6.3.3