[PATCH 21/27] dlls/gphoto2.ds: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech at gmail.com>

---
 dlls/gphoto2.ds/Makefile.in    |    1 -
 dlls/gphoto2.ds/capability.c   |    6 +++---
 dlls/gphoto2.ds/gphoto2_main.c |    4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in
index c1f6978947f..bff1ac48133 100644
--- a/dlls/gphoto2.ds/Makefile.in
+++ b/dlls/gphoto2.ds/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = gphoto2.ds
 UNIXLIB   = gphoto2.so
 IMPORTS   = $(JPEG_PE_LIBS) comctl32 user32 gdi32 advapi32
diff --git a/dlls/gphoto2.ds/capability.c b/dlls/gphoto2.ds/capability.c
index f2d250c7418..dbbf2a04855 100644
--- a/dlls/gphoto2.ds/capability.c
+++ b/dlls/gphoto2.ds/capability.c
@@ -187,7 +187,7 @@ static TW_BOOL GPHOTO2_OneValueSet32 (pTW_CAPABILITY pCapability, TW_UINT32 valu
 {
     pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE));
 
-    TRACE("-> %d\n", value);
+    TRACE("-> %ld\n", value);
 
     if (pCapability->hContainer)
     {
@@ -250,7 +250,7 @@ static TW_BOOL GPHOTO2_EnumGet16 (pTW_CAPABILITY pCapability, int *nrofvalues, T
     *nrofvalues = pVal->NumItems;
     *values = HeapAlloc( GetProcessHeap(), 0, sizeof(TW_UINT16)*pVal->NumItems);
     memcpy (*values, pVal->ItemList, sizeof(TW_UINT16)*(*nrofvalues));
-    FIXME("Current Index %d, Default Index %d\n", pVal->CurrentIndex, pVal->DefaultIndex);
+    FIXME("Current Index %ld, Default Index %ld\n", pVal->CurrentIndex, pVal->DefaultIndex);
     GlobalUnlock (pCapability->hContainer);
     return TRUE;
 }
@@ -302,7 +302,7 @@ static TW_UINT16 GPHOTO2_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 act
                 if (!GPHOTO2_OneValueGet32 (pCapability, &xfermechtemp))
                     return TWCC_LOWMEMORY;
 		activeDS.capXferMech = xfermechtemp;
-                TRACE("xfermech is %d\n", xfermechtemp);
+                TRACE("xfermech is %ld\n", xfermechtemp);
 		return TWCC_SUCCESS;
             }
             else if (pCapability->ConType == TWON_ENUMERATION)
diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c
index 5689ad94190..68c628b4d89 100644
--- a/dlls/gphoto2.ds/gphoto2_main.c
+++ b/dlls/gphoto2.ds/gphoto2_main.c
@@ -481,7 +481,7 @@ unixlib_handle_t gphoto2_handle = 0;
 
 BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
 
     switch (fdwReason)
     {
@@ -943,7 +943,7 @@ DS_Entry ( pTW_IDENTITY pOrigin,
 {
     TW_UINT16 twRC = TWRC_SUCCESS;  /* Return Code */
 
-    TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG);
+    TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG);
 
     switch (DG)
     {