[Wine-devel] wineusbhub: ifdef changes

[Alexander Morozov]

----------- следующая часть -----------
From 61f425b4b9b5ca3e0a4e891144561216184da3a7 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на builder.office.etersoft.ru>
Date: Thu, 19 Jun 2008 15:39:47 +0400
Subject: [PATCH] wineusbhub: ifdef changes

---
 dlls/wineusbhub/wineusbhub.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/wineusbhub/wineusbhub.c b/dlls/wineusbhub/wineusbhub.c
index 0f3afb0..32b49d0 100644
--- a/dlls/wineusbhub/wineusbhub.c
+++ b/dlls/wineusbhub/wineusbhub.c
@@ -19,7 +19,6 @@
 
 #include <stdarg.h>
 
-#undef HAVE_USB_H
 #ifdef HAVE_USB_H
 #include <usb.h>
 #endif
@@ -39,7 +38,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wineusbhub);
 
-#ifdef HAVE_USB_H
+#if defined(HAVE_LIBUSB) && defined(HAVE_USB_H)
 extern void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost );
 
 DRIVER_OBJECT hubdrv;
@@ -301,7 +300,7 @@ NTSTATUS WINAPI __wine_usbhub_dispatch_pnp( DEVICE_OBJECT *device, IRP *irp )
 
 DEVICE_OBJECT *__wine_usbhub_get_pdo( UCHAR *pdo_info )
 {
-#ifdef HAVE_USB_H
+#if defined(HAVE_LIBUSB) && defined(HAVE_USB_H)
     static const WCHAR usbpdoW[] = {'\\','D','e','v','i','c','e','\\',
                                     'U','S','B','P','D','O','-','%','u',0};
     static WCHAR bufW[20];
@@ -333,7 +332,7 @@ DEVICE_OBJECT *__wine_usbhub_get_pdo( UCHAR *pdo_info )
 
 BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv )
 {
-#ifdef HAVE_USB_H
+#if defined(HAVE_LIBUSB) && defined(HAVE_USB_H)
     if (fdwReason == DLL_PROCESS_ATTACH)
     {
         usb_init();
-- 
1.5.4.5.GIT