Re: [PATCH v3 13/13] Fix preprocessor commands for different kinds of build

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



What is the issue being fixed here? When does this break? This all
belongs in the commit log.

Christophe

On Mon, Aug 03, 2015 at 04:10:53PM +0300, Kirill Moizik wrote:
> From: Kirill Moizik <kmoizik@xxxxxxxxxx>
> 
> ---
>  src/usb-device-manager.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/usb-device-manager.c b/src/usb-device-manager.c
> index b666671..5bed286 100644
> --- a/src/usb-device-manager.c
> +++ b/src/usb-device-manager.c
> @@ -234,7 +234,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) {
> @@ -388,7 +388,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);
> -- 
> 2.4.3
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/spice-devel

Attachment: pgplYAC_N_3Ef.pgp
Description: PGP signature

_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel

[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]     [Monitors]