diff options
39 files changed, 35 insertions, 107 deletions
diff --git a/libpeas/meson.build b/libpeas/meson.build index 9b716de..a5eaa99 100644 --- a/libpeas/meson.build +++ b/libpeas/meson.build @@ -58,7 +58,6 @@ libpeas_deps = [ ] libpeas_c_args = [ - '-DHAVE_CONFIG_H', '-DG_LOG_DOMAIN="libpeas"', '-DDATADIR="@0@"'.format(datadir), '-DLIBDIR="@0@"'.format(libdir), diff --git a/libpeas/peas-debug.c b/libpeas/peas-debug.c index 67eacd2..9cdd023 100644 --- a/libpeas/peas-debug.c +++ b/libpeas/peas-debug.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "peas-debug.h" diff --git a/libpeas/peas-dirs.c b/libpeas/peas-dirs.c index 6839507..3f4d069 100644 --- a/libpeas/peas-dirs.c +++ b/libpeas/peas-dirs.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "peas-dirs.h" diff --git a/libpeas/peas-i18n.c b/libpeas/peas-i18n.c index 59e0ed9..3f07de7 100644 --- a/libpeas/peas-i18n.c +++ b/libpeas/peas-i18n.c @@ -19,9 +19,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <glib/gi18n.h> #include <string.h> diff --git a/libpeas/peas-introspection.c b/libpeas/peas-introspection.c index a37a291..8be9f48 100644 --- a/libpeas/peas-introspection.c +++ b/libpeas/peas-introspection.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <string.h> diff --git a/libpeas/peas-plugin-loader-c.c b/libpeas/peas-plugin-loader-c.c index 9c94251..afe6ca9 100644 --- a/libpeas/peas-plugin-loader-c.c +++ b/libpeas/peas-plugin-loader-c.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <string.h> diff --git a/libpeas/peas-utils-osx.m b/libpeas/peas-utils-osx.m index 3b7b11b..4b960b9 100644 --- a/libpeas/peas-utils-osx.m +++ b/libpeas/peas-utils-osx.m @@ -21,9 +21,7 @@ * Author: Tom Schoonjans <Tom.Schoonjans@gmail.com> */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "peas-utils-osx.h" diff --git a/libpeas/peas-utils.c b/libpeas/peas-utils.c index f8722b3..1302fce 100644 --- a/libpeas/peas-utils.c +++ b/libpeas/peas-utils.c @@ -22,9 +22,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <string.h> diff --git a/loaders/lua5.1/meson.build b/loaders/lua5.1/meson.build index f87707d..6f9f4bb 100644 --- a/loaders/lua5.1/meson.build +++ b/loaders/lua5.1/meson.build @@ -22,7 +22,6 @@ lua51_loader_deps = [ ] lua51_loader_c_args = [ - '-DHAVE_CONFIG_H', '-DLGI_MAJOR_VERSION=@0@'.format(lua51_lgi_version_major), '-DLGI_MINOR_VERSION=@0@'.format(lua51_lgi_version_minor), '-DLGI_MICRO_VERSION=@0@'.format(lua51_lgi_version_micro), diff --git a/loaders/lua5.1/peas-lua-internal.c b/loaders/lua5.1/peas-lua-internal.c index 61bb9dd..5530015 100644 --- a/loaders/lua5.1/peas-lua-internal.c +++ b/loaders/lua5.1/peas-lua-internal.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "peas-lua-internal.h" diff --git a/loaders/lua5.1/peas-lua-utils.c b/loaders/lua5.1/peas-lua-utils.c index a3e9d00..a74fa34 100644 --- a/loaders/lua5.1/peas-lua-utils.c +++ b/loaders/lua5.1/peas-lua-utils.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "peas-lua-utils.h" diff --git a/loaders/lua5.1/peas-plugin-loader-lua.c b/loaders/lua5.1/peas-plugin-loader-lua.c index c32d5ad..14a66ba 100644 --- a/loaders/lua5.1/peas-plugin-loader-lua.c +++ b/loaders/lua5.1/peas-plugin-loader-lua.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "peas-plugin-loader-lua.h" #include "libpeas/peas-plugin-info-priv.h" diff --git a/loaders/python/meson.build b/loaders/python/meson.build index 458781e..2edbe17 100644 --- a/loaders/python/meson.build +++ b/loaders/python/meson.build @@ -24,7 +24,6 @@ python3_loader_deps = [ ] python3_loader_c_args = [ - '-DHAVE_CONFIG_H', '-DPEAS_LOCALEDIR="@0@"'.format(localedir), '-DPYGOBJECT_MAJOR_VERSION=@0@'.format(pygobject_version_major), '-DPYGOBJECT_MINOR_VERSION=@0@'.format(pygobject_version_minor), diff --git a/loaders/python/peas-plugin-loader-python.c b/loaders/python/peas-plugin-loader-python.c index 028a7ef..b589709 100644 --- a/loaders/python/peas-plugin-loader-python.c +++ b/loaders/python/peas-plugin-loader-python.c @@ -22,9 +22,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "peas-plugin-loader-python.h" #include "peas-python-internal.h" diff --git a/loaders/python/peas-python-internal.c b/loaders/python/peas-python-internal.c index 5ca54d8..b1b4c27 100644 --- a/loaders/python/peas-python-internal.c +++ b/loaders/python/peas-python-internal.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "peas-python-internal.h" diff --git a/tests/libpeas/engine.c b/tests/libpeas/engine.c index 5a81d87..6eb3db2 100644 --- a/tests/libpeas/engine.c +++ b/tests/libpeas/engine.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <stdlib.h> #include <glib.h> diff --git a/tests/libpeas/extension-c.c b/tests/libpeas/extension-c.c index cdd7f76..69438f4 100644 --- a/tests/libpeas/extension-c.c +++ b/tests/libpeas/extension-c.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "libpeas.h" #include "peas-plugin-info-priv.h" diff --git a/tests/libpeas/extension-lua.c b/tests/libpeas/extension-lua.c index 0a0b541..b5a21dd 100644 --- a/tests/libpeas/extension-lua.c +++ b/tests/libpeas/extension-lua.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <lua.h> #include <lauxlib.h> @@ -179,7 +177,7 @@ main (int argc, #undef EXTENSION_TEST #undef EXTENSION_TEST_FUNC - + #define EXTENSION_TEST(loader, path, func) \ testing_extension_add (EXTENSION_TEST_NAME (loader, path), \ (gpointer) test_extension_lua_##func) diff --git a/tests/libpeas/extension-py.c b/tests/libpeas/extension-py.c index f71c14a..7adb7b9 100644 --- a/tests/libpeas/extension-py.c +++ b/tests/libpeas/extension-py.c @@ -22,9 +22,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <pygobject.h> @@ -237,7 +235,7 @@ main (int argc, #undef EXTENSION_TEST #undef EXTENSION_TEST_FUNC - + #define EXTENSION_TEST(loader, path, func) \ testing_extension_add (EXTENSION_TEST_NAME (loader, path), \ (gpointer) test_extension_py_##func) diff --git a/tests/libpeas/extension-set.c b/tests/libpeas/extension-set.c index ba8942f..313da01 100644 --- a/tests/libpeas/extension-set.c +++ b/tests/libpeas/extension-set.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <stdlib.h> diff --git a/tests/libpeas/introspection/introspection-abstract.c b/tests/libpeas/introspection/introspection-abstract.c index a3754f8..73bd4cb 100644 --- a/tests/libpeas/introspection/introspection-abstract.c +++ b/tests/libpeas/introspection/introspection-abstract.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "introspection-abstract.h" diff --git a/tests/libpeas/introspection/introspection-base.c b/tests/libpeas/introspection/introspection-base.c index f49a6b3..89cb4a9 100644 --- a/tests/libpeas/introspection/introspection-base.c +++ b/tests/libpeas/introspection/introspection-base.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "introspection-base.h" diff --git a/tests/libpeas/introspection/introspection-callable.c b/tests/libpeas/introspection/introspection-callable.c index 855a95e..0fdd18f 100644 --- a/tests/libpeas/introspection/introspection-callable.c +++ b/tests/libpeas/introspection/introspection-callable.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "introspection-callable.h" diff --git a/tests/libpeas/introspection/introspection-has-prerequisite.c b/tests/libpeas/introspection/introspection-has-prerequisite.c index fb53160..5ea5f7a 100644 --- a/tests/libpeas/introspection/introspection-has-prerequisite.c +++ b/tests/libpeas/introspection/introspection-has-prerequisite.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "introspection-base.h" #include "introspection-callable.h" diff --git a/tests/libpeas/introspection/introspection-prerequisite.c b/tests/libpeas/introspection/introspection-prerequisite.c index 8520d30..1e3ef57 100644 --- a/tests/libpeas/introspection/introspection-prerequisite.c +++ b/tests/libpeas/introspection/introspection-prerequisite.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "introspection-prerequisite.h" diff --git a/tests/libpeas/introspection/introspection-unimplemented.c b/tests/libpeas/introspection/introspection-unimplemented.c index eafb007..fb08465 100644 --- a/tests/libpeas/introspection/introspection-unimplemented.c +++ b/tests/libpeas/introspection/introspection-unimplemented.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include "introspection-unimplemented.h" diff --git a/tests/libpeas/introspection/meson.build b/tests/libpeas/introspection/meson.build index cb7a229..f2e3853 100644 --- a/tests/libpeas/introspection/meson.build +++ b/tests/libpeas/introspection/meson.build @@ -26,7 +26,6 @@ libintrospection_deps = [ ] libintrospection_c_args = [ - '-DHAVE_CONFIG_H', ] libintrospection_lib = library( diff --git a/tests/libpeas/plugin-info.c b/tests/libpeas/plugin-info.c index 369ec79..65c4688 100644 --- a/tests/libpeas/plugin-info.c +++ b/tests/libpeas/plugin-info.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <stdlib.h> diff --git a/tests/libpeas/plugins/embedded/embedded-plugin.c b/tests/libpeas/plugins/embedded/embedded-plugin.c index 4fc876f..747b2c5 100644 --- a/tests/libpeas/plugins/embedded/embedded-plugin.c +++ b/tests/libpeas/plugins/embedded/embedded-plugin.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <glib-object.h> diff --git a/tests/libpeas/plugins/extension-c/extension-c-abstract.c b/tests/libpeas/plugins/extension-c/extension-c-abstract.c index 1a64dc8..e074ce1 100644 --- a/tests/libpeas/plugins/extension-c/extension-c-abstract.c +++ b/tests/libpeas/plugins/extension-c/extension-c-abstract.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <glib-object.h> diff --git a/tests/libpeas/plugins/extension-c/extension-c-plugin.c b/tests/libpeas/plugins/extension-c/extension-c-plugin.c index b0225f1..758c3de 100644 --- a/tests/libpeas/plugins/extension-c/extension-c-plugin.c +++ b/tests/libpeas/plugins/extension-c/extension-c-plugin.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <glib.h> #include <glib-object.h> diff --git a/tests/libpeas/testing/meson.build b/tests/libpeas/testing/meson.build index 74ba7b1..9278747 100644 --- a/tests/libpeas/testing/meson.build +++ b/tests/libpeas/testing/meson.build @@ -20,7 +20,6 @@ libpeas_testing_deps = [ ] libpeas_testing_c_args = [ - '-DHAVE_CONFIG_H', '-DBUILDDIR="@0@"'.format(builddir), '-DSRCDIR="@0@"'.format(srcdir), ] diff --git a/tests/libpeas/testing/testing-extension.c b/tests/libpeas/testing/testing-extension.c index 59b736a..9df6457 100644 --- a/tests/libpeas/testing/testing-extension.c +++ b/tests/libpeas/testing/testing-extension.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <stdlib.h> #include <stdio.h> diff --git a/tests/libpeas/testing/testing.c b/tests/libpeas/testing/testing.c index 75748fe..083b8a2 100644 --- a/tests/libpeas/testing/testing.c +++ b/tests/libpeas/testing/testing.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <stdlib.h> diff --git a/tests/plugins/builtin/builtin-plugin.c b/tests/plugins/builtin/builtin-plugin.c index 3e66c86..9533433 100644 --- a/tests/plugins/builtin/builtin-plugin.c +++ b/tests/plugins/builtin/builtin-plugin.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <glib.h> #include <glib-object.h> diff --git a/tests/plugins/has-dep/has-dep-plugin.c b/tests/plugins/has-dep/has-dep-plugin.c index 61829a7..57cb237 100644 --- a/tests/plugins/has-dep/has-dep-plugin.c +++ b/tests/plugins/has-dep/has-dep-plugin.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <glib.h> #include <glib-object.h> diff --git a/tests/plugins/loadable/loadable-plugin.c b/tests/plugins/loadable/loadable-plugin.c index 0ecc0bb..f279407 100644 --- a/tests/plugins/loadable/loadable-plugin.c +++ b/tests/plugins/loadable/loadable-plugin.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <glib.h> #include <glib-object.h> diff --git a/tests/plugins/self-dep/self-dep-plugin.c b/tests/plugins/self-dep/self-dep-plugin.c index 02f9b6a..45d5f4d 100644 --- a/tests/plugins/self-dep/self-dep-plugin.c +++ b/tests/plugins/self-dep/self-dep-plugin.c @@ -21,9 +21,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <glib.h> #include <glib-object.h> diff --git a/tests/testing-util/meson.build b/tests/testing-util/meson.build index 34fd221..521337d 100644 --- a/tests/testing-util/meson.build +++ b/tests/testing-util/meson.build @@ -18,7 +18,6 @@ libtesting_util_deps = [ ] libtesting_util_c_args = [ - '-DHAVE_CONFIG_H', '-DBUILDDIR="@0@"'.format(builddir), '-DSRCDIR="@0@"'.format(srcdir), '-UG_DISABLE_ASSERT', |