From da339c286f19255b08a609de35e4e672d4fc1f8d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 9 Jun 2021 10:41:45 +1000 Subject: [PATCH] meson.build: drop HAVE_CONFIG_H This is an autotools leftover, with meson we're always guaranteed to have the config.h file. --- pipewire-alsa/alsa-plugins/meson.build | 1 - pipewire-jack/src/control.c | 2 -- pipewire-jack/src/dummy.c | 2 -- pipewire-jack/src/meson.build | 1 - pipewire-jack/src/metadata.c | 2 -- pipewire-jack/src/pipewire-jack.c | 2 -- pipewire-jack/src/ringbuffer.c | 2 -- pipewire-jack/src/uuid.c | 2 -- spa/plugins/alsa/acp/alsa-mixer.c | 2 -- spa/plugins/alsa/acp/alsa-ucm.c | 2 -- spa/plugins/alsa/acp/alsa-util.c | 2 -- spa/plugins/alsa/acp/conf-parser.c | 2 -- spa/plugins/alsa/acp/meson.build | 1 - spa/plugins/audioconvert/biquad.c | 2 -- spa/plugins/audioconvert/crossover.c | 2 -- src/daemon/meson.build | 1 - src/gst/gstpipewire.c | 2 -- src/gst/gstpipewireclock.c | 2 -- src/gst/gstpipewirecore.c | 2 -- src/gst/gstpipewiredeviceprovider.c | 2 -- src/gst/gstpipewiredeviceprovider.h | 2 -- src/gst/gstpipewirepool.c | 2 -- src/gst/gstpipewiresink.c | 2 -- src/gst/gstpipewiresrc.c | 2 -- src/gst/meson.build | 5 ----- src/modules/meson.build | 23 ----------------------- src/modules/module-rtkit.c | 2 -- src/modules/spa/meson.build | 8 -------- src/modules/spa/module-device.c | 2 -- src/modules/spa/module-node.c | 2 -- src/modules/spa/spa-device.c | 2 -- src/modules/spa/spa-node.c | 2 -- src/pipewire/impl-module.c | 2 -- src/pipewire/meson.build | 1 - src/pipewire/pipewire.c | 2 -- test/meson.build | 1 - test/pwtest.c | 2 -- test/pwtest.h | 2 -- test/test-array.c | 2 -- test/test-example.c | 2 -- test/test-lib.c | 2 -- test/test-properties.c | 2 -- 42 files changed, 108 deletions(-) diff --git a/pipewire-alsa/alsa-plugins/meson.build b/pipewire-alsa/alsa-plugins/meson.build index 28735e22b..355ee214e 100644 --- a/pipewire-alsa/alsa-plugins/meson.build +++ b/pipewire-alsa/alsa-plugins/meson.build @@ -6,7 +6,6 @@ pipewire_alsa_plugin_ctl_sources = [ ] pipewire_alsa_plugin_c_args = [ - '-DHAVE_CONFIG_H', '-DPIC', ] diff --git a/pipewire-jack/src/control.c b/pipewire-jack/src/control.c index 801826cd4..da06e2c66 100644 --- a/pipewire-jack/src/control.c +++ b/pipewire-jack/src/control.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/pipewire-jack/src/dummy.c b/pipewire-jack/src/dummy.c index 6112268bf..1d6bb5724 100644 --- a/pipewire-jack/src/dummy.c +++ b/pipewire-jack/src/dummy.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build index c5d598a7e..b0ab8dcba 100644 --- a/pipewire-jack/src/meson.build +++ b/pipewire-jack/src/meson.build @@ -15,7 +15,6 @@ pipewire_dummy_sources = [ ] pipewire_jack_c_args = [ - '-DHAVE_CONFIG_H', '-DPIC', ] diff --git a/pipewire-jack/src/metadata.c b/pipewire-jack/src/metadata.c index 4cbfcc722..2dda3c65d 100644 --- a/pipewire-jack/src/metadata.c +++ b/pipewire-jack/src/metadata.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c index 2f733036e..3523d5fe2 100644 --- a/pipewire-jack/src/pipewire-jack.c +++ b/pipewire-jack/src/pipewire-jack.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/pipewire-jack/src/ringbuffer.c b/pipewire-jack/src/ringbuffer.c index 7742d1d81..887c7dce6 100644 --- a/pipewire-jack/src/ringbuffer.c +++ b/pipewire-jack/src/ringbuffer.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/pipewire-jack/src/uuid.c b/pipewire-jack/src/uuid.c index e93fbf976..19fad3a23 100644 --- a/pipewire-jack/src/uuid.c +++ b/pipewire-jack/src/uuid.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/spa/plugins/alsa/acp/alsa-mixer.c b/spa/plugins/alsa/acp/alsa-mixer.c index d3ccdb1ff..4cda9017f 100644 --- a/spa/plugins/alsa/acp/alsa-mixer.c +++ b/spa/plugins/alsa/acp/alsa-mixer.c @@ -18,9 +18,7 @@ along with PulseAudio; if not, see . ***/ -#ifdef HAVE_CONFIG_H #include -#endif #include #include diff --git a/spa/plugins/alsa/acp/alsa-ucm.c b/spa/plugins/alsa/acp/alsa-ucm.c index 65ad9ea02..4c0bb3a1c 100644 --- a/spa/plugins/alsa/acp/alsa-ucm.c +++ b/spa/plugins/alsa/acp/alsa-ucm.c @@ -20,9 +20,7 @@ ***/ -#ifdef HAVE_CONFIG_H #include -#endif #include #include diff --git a/spa/plugins/alsa/acp/alsa-util.c b/spa/plugins/alsa/acp/alsa-util.c index fd8f335c4..5db9b141a 100644 --- a/spa/plugins/alsa/acp/alsa-util.c +++ b/spa/plugins/alsa/acp/alsa-util.c @@ -18,9 +18,7 @@ along with PulseAudio; if not, see . ***/ -#ifdef HAVE_CONFIG_H #include -#endif #include #include diff --git a/spa/plugins/alsa/acp/conf-parser.c b/spa/plugins/alsa/acp/conf-parser.c index a08b64969..cb3e66946 100644 --- a/spa/plugins/alsa/acp/conf-parser.c +++ b/spa/plugins/alsa/acp/conf-parser.c @@ -17,9 +17,7 @@ along with PulseAudio; if not, see . ***/ -#ifdef HAVE_CONFIG_H #include -#endif #include #include diff --git a/spa/plugins/alsa/acp/meson.build b/spa/plugins/alsa/acp/meson.build index 31986275d..28330890a 100644 --- a/spa/plugins/alsa/acp/meson.build +++ b/spa/plugins/alsa/acp/meson.build @@ -9,7 +9,6 @@ acp_sources = [ acp_c_args = [ '-DHAVE_ALSA_UCM', - '-DHAVE_CONFIG_H', '-DHAVE_READLINK', ] diff --git a/spa/plugins/audioconvert/biquad.c b/spa/plugins/audioconvert/biquad.c index c8b04e66f..d32ae728d 100644 --- a/spa/plugins/audioconvert/biquad.c +++ b/spa/plugins/audioconvert/biquad.c @@ -9,9 +9,7 @@ */ -#ifdef HAVE_CONFIG_H #include -#endif #include diff --git a/spa/plugins/audioconvert/crossover.c b/spa/plugins/audioconvert/crossover.c index 19e1ef9f3..9cf195884 100644 --- a/spa/plugins/audioconvert/crossover.c +++ b/spa/plugins/audioconvert/crossover.c @@ -3,9 +3,7 @@ * found in the LICENSE file. */ -#ifdef HAVE_CONFIG_H #include -#endif #include "crossover.h" diff --git a/src/daemon/meson.build b/src/daemon/meson.build index 103f77f38..85281a9e3 100644 --- a/src/daemon/meson.build +++ b/src/daemon/meson.build @@ -3,7 +3,6 @@ pipewire_daemon_sources = [ ] pipewire_c_args = [ - '-DHAVE_CONFIG_H', '-DG_LOG_DOMAIN=g_log_domain_pipewire', ] diff --git a/src/gst/gstpipewire.c b/src/gst/gstpipewire.c index 9f752fe2e..ef8a9ef58 100644 --- a/src/gst/gstpipewire.c +++ b/src/gst/gstpipewire.c @@ -33,9 +33,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gstpipewiresrc.h" #include "gstpipewiresink.h" diff --git a/src/gst/gstpipewireclock.c b/src/gst/gstpipewireclock.c index 634b6e398..44b1158d2 100644 --- a/src/gst/gstpipewireclock.c +++ b/src/gst/gstpipewireclock.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/src/gst/gstpipewirecore.c b/src/gst/gstpipewirecore.c index b8670a67f..75bdbb84b 100644 --- a/src/gst/gstpipewirecore.c +++ b/src/gst/gstpipewirecore.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/gst/gstpipewiredeviceprovider.c b/src/gst/gstpipewiredeviceprovider.c index f396eb034..454815dca 100644 --- a/src/gst/gstpipewiredeviceprovider.c +++ b/src/gst/gstpipewiredeviceprovider.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/src/gst/gstpipewiredeviceprovider.h b/src/gst/gstpipewiredeviceprovider.h index 0e6df94d6..badb3837f 100644 --- a/src/gst/gstpipewiredeviceprovider.h +++ b/src/gst/gstpipewiredeviceprovider.h @@ -26,9 +26,7 @@ #ifndef __GST_PIPEWIRE_DEVICE_PROVIDER_H__ #define __GST_PIPEWIRE_DEVICE_PROVIDER_H__ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/src/gst/gstpipewirepool.c b/src/gst/gstpipewirepool.c index 9c541806d..4fbc9bcac 100644 --- a/src/gst/gstpipewirepool.c +++ b/src/gst/gstpipewirepool.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/src/gst/gstpipewiresink.c b/src/gst/gstpipewiresink.c index 2f79a4f70..8870d0dca 100644 --- a/src/gst/gstpipewiresink.c +++ b/src/gst/gstpipewiresink.c @@ -33,9 +33,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gstpipewiresink.h" #include diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c index 28a0da0bb..5341f6e6b 100644 --- a/src/gst/gstpipewiresrc.c +++ b/src/gst/gstpipewiresrc.c @@ -33,9 +33,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gstpipewiresrc.h" #include "gstpipewireformat.h" diff --git a/src/gst/meson.build b/src/gst/meson.build index 6ed9e4b56..b91b33dc9 100644 --- a/src/gst/meson.build +++ b/src/gst/meson.build @@ -22,13 +22,8 @@ pipewire_gst_headers = [ 'gstpipewiresrc.h', ] -pipewire_gst_c_args = [ - '-DHAVE_CONFIG_H', -] - pipewire_gst = shared_library('gstpipewire', pipewire_gst_sources, - c_args : pipewire_gst_c_args, include_directories : [configinc, spa_inc], dependencies : [gst_dep, pipewire_dep], install : true, diff --git a/src/modules/meson.build b/src/modules/meson.build index 562b36d9f..f39fdbc80 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -1,11 +1,6 @@ subdir('spa') -pipewire_module_c_args = [ - '-DHAVE_CONFIG_H', -] - pipewire_module_access = shared_library('pipewire-module-access', [ 'module-access.c' ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -15,7 +10,6 @@ pipewire_module_access = shared_library('pipewire-module-access', [ 'module-acce pipewire_module_loopback = shared_library('pipewire-module-loopback', [ 'module-loopback.c' ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -26,7 +20,6 @@ pipewire_module_loopback = shared_library('pipewire-module-loopback', pipewire_module_filter_chain = shared_library('pipewire-module-filter-chain', [ 'module-filter-chain.c', 'module-filter-chain/biquad.c' ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -47,7 +40,6 @@ endif pipewire_module_echo_cancel = shared_library('pipewire-module-echo-cancel', pipewire_module_echo_cancel_sources, - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -58,7 +50,6 @@ pipewire_module_echo_cancel = shared_library('pipewire-module-echo-cancel', pipewire_module_profiler = shared_library('pipewire-module-profiler', [ 'module-profiler.c', 'module-profiler/protocol-native.c', ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -68,7 +59,6 @@ pipewire_module_profiler = shared_library('pipewire-module-profiler', if build_machine.system() == 'linux' pipewire_module_rt = shared_library('pipewire-module-rt', [ 'module-rt.c' ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -79,7 +69,6 @@ endif if dbus_dep.found() pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rtkit.c' ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -87,7 +76,6 @@ pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rtkit. dependencies : [dbus_dep, mathlib, dl_lib, pipewire_dep], ) pipewire_module_portal = shared_library('pipewire-module-portal', [ 'module-portal.c' ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -101,7 +89,6 @@ pipewire_module_client_node = shared_library('pipewire-module-client-device', 'module-client-device/resource-device.c', 'module-client-device/proxy-device.c', 'module-client-device/protocol-native.c', ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -111,7 +98,6 @@ pipewire_module_client_node = shared_library('pipewire-module-client-device', pipewire_module_link_factory = shared_library('pipewire-module-link-factory', [ 'module-link-factory.c' ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -132,7 +118,6 @@ pipewire_module_protocol_native = shared_library('pipewire-module-protocol-nativ 'module-protocol-native/protocol-native.c', 'module-protocol-native/v0/protocol-native.c', 'module-protocol-native/connection.c' ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -165,7 +150,6 @@ pipewire_module_protocol_pulse = shared_library('pipewire-module-protocol-pulse' 'module-protocol-pulse/modules/module-tunnel-source.c', 'module-protocol-pulse/modules/module-zeroconf-discover.c', ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -176,7 +160,6 @@ pipewire_module_protocol_pulse = shared_library('pipewire-module-protocol-pulse' if pulseaudio_dep.found() pipewire_module_pulse_tunnel = shared_library('pipewire-module-pulse-tunnel', [ 'module-pulse-tunnel.c' ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -187,7 +170,6 @@ endif pipewire_module_protocol_simple = shared_library('pipewire-module-protocol-simple', [ 'module-protocol-simple.c' ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -204,7 +186,6 @@ pipewire_module_client_node = shared_library('pipewire-module-client-node', 'module-client-node/v0/transport.c', 'module-client-node/v0/protocol-native.c', 'spa/spa-node.c', ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], link_with : pipewire_module_protocol_native, install : true, @@ -218,7 +199,6 @@ pipewire_module_metadata = shared_library('pipewire-module-metadata', 'module-metadata/proxy-metadata.c', 'module-metadata/metadata.c', 'module-metadata/protocol-native.c'], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], link_with : pipewire_module_protocol_native, install : true, @@ -257,7 +237,6 @@ pipewire_module_adapter = shared_library('pipewire-module-adapter', [ 'module-adapter.c', 'module-adapter/adapter.c', 'spa/spa-node.c' ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -280,7 +259,6 @@ pipewire_module_session_manager = shared_library('pipewire-module-session-manage 'module-session-manager/proxy-session-manager.c', 'module-session-manager/session.c', ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -292,7 +270,6 @@ if avahi_dep.found() pipewire_module_zeroconf_discover = shared_library('pipewire-module-zeroconf-discover', [ 'module-zeroconf-discover.c', 'module-zeroconf-discover/avahi-poll.c' ], - c_args : pipewire_module_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c index fa55cc262..c71d130aa 100644 --- a/src/modules/module-rtkit.c +++ b/src/modules/module-rtkit.c @@ -109,9 +109,7 @@ struct impl { #include -#ifdef HAVE_CONFIG_H #include -#endif #include diff --git a/src/modules/spa/meson.build b/src/modules/spa/meson.build index 20486a6b8..ab4fac18d 100644 --- a/src/modules/spa/meson.build +++ b/src/modules/spa/meson.build @@ -1,10 +1,5 @@ -pipewire_module_spa_c_args = [ - '-DHAVE_CONFIG_H', -] - pipewire_module_spa_node = shared_library('pipewire-module-spa-node', [ 'module-node.c', 'spa-node.c' ], - c_args : pipewire_module_spa_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -13,7 +8,6 @@ pipewire_module_spa_node = shared_library('pipewire-module-spa-node', pipewire_module_spa_device = shared_library('pipewire-module-spa-device', [ 'module-device.c', 'spa-device.c' ], - c_args : pipewire_module_spa_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -22,7 +16,6 @@ pipewire_module_spa_device = shared_library('pipewire-module-spa-device', pipewire_module_spa_node_factory = shared_library('pipewire-module-spa-node-factory', [ 'module-node-factory.c', 'spa-node.c' ], - c_args : pipewire_module_spa_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, @@ -31,7 +24,6 @@ pipewire_module_spa_node_factory = shared_library('pipewire-module-spa-node-fact pipewire_module_spa_device_factory = shared_library('pipewire-module-spa-device-factory', [ 'module-device-factory.c', 'spa-device.c' ], - c_args : pipewire_module_spa_c_args, include_directories : [configinc, spa_inc], install : true, install_dir : modules_install_dir, diff --git a/src/modules/spa/module-device.c b/src/modules/spa/module-device.c index 886237fde..240756cf3 100644 --- a/src/modules/spa/module-device.c +++ b/src/modules/spa/module-device.c @@ -21,9 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/modules/spa/module-node.c b/src/modules/spa/module-node.c index d67219f60..136f719b6 100644 --- a/src/modules/spa/module-node.c +++ b/src/modules/spa/module-node.c @@ -23,9 +23,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/modules/spa/spa-device.c b/src/modules/spa/spa-device.c index 84f189b16..936793b52 100644 --- a/src/modules/spa/spa-device.c +++ b/src/modules/spa/spa-device.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/modules/spa/spa-node.c b/src/modules/spa/spa-node.c index 7f473e2ed..1dea28486 100644 --- a/src/modules/spa/spa-node.c +++ b/src/modules/spa/spa-node.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/pipewire/impl-module.c b/src/pipewire/impl-module.c index 859f57a80..a2b769275 100644 --- a/src/pipewire/impl-module.c +++ b/src/pipewire/impl-module.c @@ -23,9 +23,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build index c40aa7042..860b226e8 100644 --- a/src/pipewire/meson.build +++ b/src/pipewire/meson.build @@ -86,7 +86,6 @@ configure_file(input : 'version.h.in', install_headers(pipewire_headers, subdir : pipewire_headers_dir) libpipewire_c_args = [ - '-DHAVE_CONFIG_H', ] if build_machine.system() != 'freebsd' diff --git a/src/pipewire/pipewire.c b/src/pipewire/pipewire.c index 83349db16..1737622c3 100644 --- a/src/pipewire/pipewire.c +++ b/src/pipewire/pipewire.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/test/meson.build b/test/meson.build index 8ec2974ac..c1f0db100 100644 --- a/test/meson.build +++ b/test/meson.build @@ -11,7 +11,6 @@ pwtest_deps = [ ] pwtest_c_args = [ - '-DHAVE_CONFIG_H', '-DBUILD_ROOT="@0@"'.format(meson.build_root()), '-DSOURCE_ROOT="@0@"'.format(meson.source_root()), ] diff --git a/test/pwtest.c b/test/pwtest.c index 14b0954a9..a0cc21dd1 100644 --- a/test/pwtest.c +++ b/test/pwtest.c @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/test/pwtest.h b/test/pwtest.h index 01817bdc0..63ca3ee2a 100644 --- a/test/pwtest.h +++ b/test/pwtest.h @@ -22,9 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifndef PWTEST_H #define PWTEST_H diff --git a/test/test-array.c b/test/test-array.c index dc7a82259..4b976e521 100644 --- a/test/test-array.c +++ b/test/test-array.c @@ -23,9 +23,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "pwtest.h" #include "pipewire/array.h" diff --git a/test/test-example.c b/test/test-example.c index 4cd4c9627..05f97794b 100644 --- a/test/test-example.c +++ b/test/test-example.c @@ -24,9 +24,7 @@ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/test/test-lib.c b/test/test-lib.c index a372ac8db..cb61a696a 100644 --- a/test/test-lib.c +++ b/test/test-lib.c @@ -23,9 +23,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "pwtest.h" diff --git a/test/test-properties.c b/test/test-properties.c index c1fbecea5..3bc0f2ac1 100644 --- a/test/test-properties.c +++ b/test/test-properties.c @@ -23,9 +23,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "pwtest.h"