Eric Pouech : cabinet: Enable compilation with long types.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0197a1c0cc76a15a6bae8dcdbcc6877b93d90016
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0197a1c0cc76a15a6bae8dcdbcc6877b93d90016

Author: Eric Pouech <eric.pouech at gmail.com>
Date:   Wed Feb  9 09:25:07 2022 +0100

cabinet: Enable compilation with long types.

Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

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

diff --git a/dlls/cabinet/Makefile.in b/dlls/cabinet/Makefile.in
index eb45aae8df7..4ee406480ac 100644
--- a/dlls/cabinet/Makefile.in
+++ b/dlls/cabinet/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = cabinet.dll
 IMPORTLIB = cabinet
 IMPORTS   = $(ZLIB_PE_LIBS)
diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c
index 1f442917d56..7e2e6b8fdde 100644
--- a/dlls/cabinet/fdi.c
+++ b/dlls/cabinet/fdi.c
@@ -482,7 +482,7 @@ static char *FDI_read_string(FDI_Int *fdi, INT_PTR hf, long cabsize)
   unsigned int i;
   cab_UBYTE *buf = NULL;
 
-  TRACE("(fdi == %p, hf == %ld, cabsize == %ld)\n", fdi, hf, cabsize);
+  TRACE("(fdi == %p, hf == %Id, cabsize == %ld)\n", fdi, hf, cabsize);
 
   do {
     if (len > maxlen) len = maxlen;
@@ -541,7 +541,7 @@ static BOOL FDI_read_entries(
   cab_UBYTE buf[64], block_resv;
   char *prevname = NULL, *previnfo = NULL, *nextname = NULL, *nextinfo = NULL;
 
-  TRACE("(fdi == ^%p, hf == %ld, pfdici == ^%p)\n", fdi, hf, pfdici);
+  TRACE("(fdi == ^%p, hf == %Id, pfdici == ^%p)\n", fdi, hf, pfdici);
 
   /* read in the CFHEADER */
   if (fdi->read(hf, buf, cfhead_SIZEOF) != cfhead_SIZEOF) {
@@ -698,7 +698,7 @@ BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici)
   BOOL rv;
   FDI_Int *fdi = get_fdi_ptr( hfdi );
 
-  TRACE("(hfdi == ^%p, hf == ^%ld, pfdici == ^%p)\n", hfdi, hf, pfdici);
+  TRACE("(hfdi == ^%p, hf == ^%Id, pfdici == ^%p)\n", hfdi, hf, pfdici);
 
   if (!fdi) return FALSE;