[PATCH 16/24] programs/winemsibuilder: enable compilation with long types

[Eric Pouech]

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

---
 programs/winemsibuilder/Makefile.in |    1 -
 programs/winemsibuilder/main.c      |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/programs/winemsibuilder/Makefile.in b/programs/winemsibuilder/Makefile.in
index 97ad6f13074..b9e73869645 100644
--- a/programs/winemsibuilder/Makefile.in
+++ b/programs/winemsibuilder/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = winemsibuilder.exe
 IMPORTS   = msi ole32
 
diff --git a/programs/winemsibuilder/main.c b/programs/winemsibuilder/main.c
index e6c1a4d0f79..3b1221860b3 100644
--- a/programs/winemsibuilder/main.c
+++ b/programs/winemsibuilder/main.c
@@ -188,7 +188,7 @@ static int add_stream( const WCHAR *msifile, const WCHAR *stream, const WCHAR *f
     hr = StgOpenStorage( msifile, NULL, STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg );
     if (hr != S_OK)
     {
-        WINE_WARN( "failed to open storage %s (0x%08x)\n", wine_dbgstr_w(msifile), hr );
+        WINE_WARN( "failed to open storage %s (0x%08lx)\n", wine_dbgstr_w(msifile), hr );
         return 1;
     }
     encname = encode_stream( stream );
@@ -200,13 +200,13 @@ static int add_stream( const WCHAR *msifile, const WCHAR *stream, const WCHAR *f
     hr = IStorage_CreateStream( stg, encname, STGM_CREATE|STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm );
     if (hr != S_OK)
     {
-        WINE_WARN( "failed to create stream %s (0x%08x)\n", wine_dbgstr_w(encname), hr );
+        WINE_WARN( "failed to create stream %s (0x%08lx)\n", wine_dbgstr_w(encname), hr );
         goto done;
     }
     handle = CreateFileW( file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL );
     if (handle == INVALID_HANDLE_VALUE)
     {
-        WINE_WARN( "failed to open file %s (%u)\n", wine_dbgstr_w(file), GetLastError() );
+        WINE_WARN( "failed to open file %s (%lu)\n", wine_dbgstr_w(file), GetLastError() );
         goto done;
     }
     low = GetFileSize( handle, &high );