[PATCH 03/21] dlls/win87em.dll16: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

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

diff --git a/dlls/win87em.dll16/Makefile.in b/dlls/win87em.dll16/Makefile.in
index b4a9ebea56b..b40ceb0c68d 100644
--- a/dlls/win87em.dll16/Makefile.in
+++ b/dlls/win87em.dll16/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = win87em.dll16
 EXTRADLLFLAGS = -m16

diff --git a/dlls/win87em.dll16/win87em.c b/dlls/win87em.dll16/win87em.c
index c8d454516f1..9a0029b98e9 100644
--- a/dlls/win87em.dll16/win87em.c
+++ b/dlls/win87em.dll16/win87em.c
@@ -101,7 +101,7 @@ static void WIN87_Init( CONTEXT *context )
  */
 void WINAPI _fpMath( CONTEXT *context )
 {
-    TRACE("(cs:eip=%04x:%04x es=%04x bx=%04x ax=%04x dx=%04x)\n",
+    TRACE("(cs:eip=%04lx:%04lx es=%04lx bx=%04lx ax=%04lx dx=%04lx)\n",
           context->SegCs, context->Eip, context->SegEs, context->Ebx,
           context->Eax, context->Edx );

@@ -174,7 +174,7 @@ void WINAPI _fpMath( CONTEXT *context )
              */
 /* FIXME: could someone who really understands asm() fix this please? --AJ */
 /*            __asm__("fistp %0;wait" : "=m" (dw) : : "memory"); */
-            TRACE("On top of stack was %d\n",dw);
+            TRACE("On top of stack was %ld\n",dw);
             context->Eax = (context->Eax & ~0xffff) | LOWORD(dw);
             context->Edx = (context->Edx & ~0xffff) | HIWORD(dw);
         }