[Spice-devel] [PATCH v4 01/16] UsbDeviceManager: Fix Windows build without USB redirection

[Dmitry Fleytman]

From: Kirill Moizik <kmoizik at redhat.com>

Signed-off-by: Kirill Moizik <kmoizik at redhat.com>
Signed-off-by: Dmitry Fleytman <dfleytma at redhat.com>
---
 src/usb-device-manager.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/usb-device-manager.c b/src/usb-device-manager.c
index 5b8151f..e7da42e 100644
--- a/src/usb-device-manager.c
+++ b/src/usb-device-manager.c
@@ -227,7 +227,7 @@ static void spice_usb_device_manager_init(SpiceUsbDeviceManager *self)
     priv = SPICE_USB_DEVICE_MANAGER_GET_PRIVATE(self);
     self->priv = priv;
 
-#ifdef G_OS_WIN32
+#if defined(USE_USBREDIR) && defined(G_OS_WIN32)
     priv->use_usbclerk = !usbdk_is_driver_installed();
     if (!priv->use_usbclerk) {
         if (usbdk_api_load(&priv->usbdk_api) != 0) {
@@ -381,7 +381,7 @@ static void spice_usb_device_manager_finalize(GObject *gobject)
     g_free(priv->auto_connect_filter);
     g_free(priv->redirect_on_connect);
 
-#ifdef G_OS_WIN32
+#if defined(USE_USBREDIR) && defined(G_OS_WIN32)
     if (!priv->use_usbclerk) {
         if (priv->usbdk_hider_handle != NULL) {
             usbdk_clear_hide_rules(priv->usbdk_api, priv->usbdk_hider_handle);
@@ -427,7 +427,7 @@ static void spice_usb_device_manager_get_property(GObject     *gobject,
     }
 }
 
-#ifdef G_OS_WIN32
+#if defined(USE_USBREDIR) && defined(G_OS_WIN32)
 static
 void _usbdk_autoredir_enable(SpiceUsbDeviceManager *manager);
 static
@@ -448,7 +448,7 @@ static void spice_usb_device_manager_set_property(GObject       *gobject,
         break;
     case PROP_AUTO_CONNECT:
         priv->auto_connect = g_value_get_boolean(value);
-#ifdef G_OS_WIN32
+#if defined(USE_USBREDIR) && defined(G_OS_WIN32)
         if (!priv->use_usbclerk) {
             if (priv->auto_connect) {
                 _usbdk_autoredir_enable(self);
-- 
2.4.3