diff options
author | Aleksander Morgado <aleksander@aleksander.es> | 2017-06-22 10:43:43 +0200 |
---|---|---|
committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-06-22 10:43:45 +0200 |
commit | b2a859a78292175f70dac46d3999c92901fbc264 (patch) | |
tree | 9044413caa56024382f3947e2d1662a0d192707f /src | |
parent | 341555504e739f7ccac11501ca874ef6b1989961 (diff) |
build: WITH_UDEV is only defined when enabled
Looks like the preprocessor doesn't choke when using #if WITH_UDEV and
it isn't defined to any value, but anyway, better explicitly say that
we're checking if it's defined or not.
Diffstat (limited to 'src')
-rw-r--r-- | src/mm-base-manager.c | 20 | ||||
-rw-r--r-- | src/mm-context.c | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/mm-base-manager.c b/src/mm-base-manager.c index 58cea119..0c76fd2c 100644 --- a/src/mm-base-manager.c +++ b/src/mm-base-manager.c @@ -24,7 +24,7 @@ #include <gmodule.h> -#if WITH_UDEV +#if defined WITH_UDEV # include "mm-kernel-device-udev.h" #endif #include "mm-kernel-device-generic.h" @@ -81,7 +81,7 @@ struct _MMBaseManagerPrivate { /* The Test interface support */ MmGdbusTest *test_skeleton; -#if WITH_UDEV +#if defined WITH_UDEV /* The UDev client */ GUdevClient *udev; #endif @@ -373,7 +373,7 @@ handle_kernel_event (MMBaseManager *self, mm_dbg (" name: %s", name); mm_dbg (" uid: %s", uid ? uid : "n/a"); -#if WITH_UDEV +#if defined WITH_UDEV kernel_device = mm_kernel_device_udev_new_from_properties (properties, error); #else kernel_device = mm_kernel_device_generic_new (properties, error); @@ -393,7 +393,7 @@ handle_kernel_event (MMBaseManager *self, return TRUE; } -#if WITH_UDEV +#if defined WITH_UDEV static void handle_uevent (GUdevClient *client, @@ -569,7 +569,7 @@ mm_base_manager_start (MMBaseManager *self, return; } -#if WITH_UDEV +#if defined WITH_UDEV mm_dbg ("Starting %s device scan...", manual_scan ? "manual" : "automatic"); process_scan (self, manual_scan); mm_dbg ("Finished device scan..."); @@ -753,7 +753,7 @@ scan_devices_auth_ready (MMAuthProvider *authp, if (!mm_auth_provider_authorize_finish (authp, res, &error)) g_dbus_method_invocation_take_error (ctx->invocation, error); else { -#if WITH_UDEV +#if defined WITH_UDEV /* Otherwise relaunch device scan */ mm_base_manager_start (MM_BASE_MANAGER (ctx->self), TRUE); mm_gdbus_org_freedesktop_modem_manager1_complete_scan_devices ( @@ -816,7 +816,7 @@ report_kernel_event_auth_ready (MMAuthProvider *authp, if (!mm_auth_provider_authorize_finish (authp, res, &error)) goto out; -#if WITH_UDEV +#if defined WITH_UDEV if (ctx->self->priv->auto_scan) { error = g_error_new_literal (MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED, "Cannot report kernel event: " @@ -1050,7 +1050,7 @@ mm_base_manager_init (MMBaseManager *manager) /* Setup internal lists of device objects */ priv->devices = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); -#if WITH_UDEV +#if defined WITH_UDEV { const gchar *subsys[5] = { "tty", "net", "usb", "usbmisc", NULL }; @@ -1090,7 +1090,7 @@ initable_init (GInitable *initable, { MMBaseManagerPrivate *priv = MM_BASE_MANAGER (initable)->priv; -#if WITH_UDEV +#if defined WITH_UDEV /* If autoscan enabled, list for udev events */ if (priv->auto_scan) g_signal_connect (priv->udev, "uevent", G_CALLBACK (handle_uevent), initable); @@ -1140,7 +1140,7 @@ finalize (GObject *object) g_hash_table_destroy (priv->devices); -#if WITH_UDEV +#if defined WITH_UDEV if (priv->udev) g_object_unref (priv->udev); #endif diff --git a/src/mm-context.c b/src/mm-context.c index 370fe28c..b7d2a281 100644 --- a/src/mm-context.c +++ b/src/mm-context.c @@ -21,7 +21,7 @@ /*****************************************************************************/ /* Application context */ -#if WITH_UDEV +#if defined WITH_UDEV # define NO_AUTO_SCAN_OPTION_FLAG 0 # define NO_AUTO_SCAN_DEFAULT FALSE #else @@ -293,7 +293,7 @@ mm_context_init (gint argc, } /* Initial kernel events processing may only be used if autoscan is disabled */ -#if WITH_UDEV +#if defined WITH_UDEV if (!no_auto_scan && initial_kernel_events) { g_warning ("error: --initial-kernel-events must be used only if --no-auto-scan is also used"); exit (1); |