[PATCH 01/25] dlls/usbd.sys: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/usbd.sys/Makefile.in |    1 -
 dlls/usbd.sys/usbd.c      |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/usbd.sys/Makefile.in b/dlls/usbd.sys/Makefile.in
index 026f4ba4219..6040071ddaf 100644
--- a/dlls/usbd.sys/Makefile.in
+++ b/dlls/usbd.sys/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = usbd.sys
 IMPORTLIB = usbd
 IMPORTS   = ntoskrnl
diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c
index 1cb25259258..d562cf1f81e 100644
--- a/dlls/usbd.sys/usbd.c
+++ b/dlls/usbd.sys/usbd.c
@@ -173,7 +173,7 @@ PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx(

PUSB_INTERFACE_DESCRIPTOR interface;

-    TRACE( "(%p, %p, %d, %d, %d, %d, %d)\n", ConfigurationDescriptor,
+    TRACE( "(%p, %p, %ld, %ld, %ld, %ld, %ld)\n", ConfigurationDescriptor,
             StartPosition, InterfaceNumber, AlternateSetting,
             InterfaceClass, InterfaceSubClass, InterfaceProtocol );

@@ -214,7 +214,7 @@ PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors(
 {
     PUSB_COMMON_DESCRIPTOR common;

-    TRACE( "(%p, %u, %p, %d)\n", DescriptorBuffer, TotalLength, StartPosition, DescriptorType );
+    TRACE( "(%p, %lu, %p, %ld)\n", DescriptorBuffer, TotalLength, StartPosition, DescriptorType );

for (common = (PUSB_COMMON_DESCRIPTOR)DescriptorBuffer;
          ((char*)common) + sizeof(USB_COMMON_DESCRIPTOR) <= ((char*)DescriptorBuffer) + TotalLength;
@@ -233,7 +233,7 @@ USBD_STATUS WINAPI USBD_ValidateConfigurationDescriptor(
         PUCHAR *offset,
         ULONG tag )
 {
-    FIXME( "(%p, %u, %u, %p, %u) partial stub!\n", descr, length, level, offset, tag );
+    FIXME( "(%p, %lu, %u, %p, %lu) partial stub!\n", descr, length, level, offset, tag );

if (offset) *offset = 0;