From 85db0937d0ddf115e175927c116bfe7200c7abea Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Thu, 5 Oct 2006 00:59:28 +0200
Subject: [PATCH] msg711.acm: Win64 printf format warning fixes.

---
 dlls/msg711.acm/Makefile.in |  1 -
 dlls/msg711.acm/msg711.c    | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/msg711.acm/Makefile.in b/dlls/msg711.acm/Makefile.in
index e5cacad6845..0579d37063d 100644
--- a/dlls/msg711.acm/Makefile.in
+++ b/dlls/msg711.acm/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msg711.acm
 IMPORTS   = winmm user32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = msg711.c
 
diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c
index 1c2478123a9..90080f958d3 100644
--- a/dlls/msg711.acm/msg711.c
+++ b/dlls/msg711.acm/msg711.c
@@ -708,7 +708,7 @@ static	LRESULT	G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
 	}
 	break;
     default:
-	WARN("Unsupported query %08lx\n", dwQuery);
+	WARN("Unsupported query %08x\n", dwQuery);
 	return MMSYSERR_NOTSUPPORTED;
     }
 
@@ -779,12 +779,12 @@ static	LRESULT	G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
             afd->pwfx->cbSize = 0;
 	    break;
 	default:
-	    WARN("Unsupported tag %08lx\n", afd->dwFormatTag);
+            WARN("Unsupported tag %08x\n", afd->dwFormatTag);
 	    return MMSYSERR_INVALPARAM;
 	}
 	break;
     default:
-	WARN("Unsupported query %08lx\n", dwQuery);
+	WARN("Unsupported query %08x\n", dwQuery);
 	return MMSYSERR_NOTSUPPORTED;
     }
     afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC;
@@ -1053,7 +1053,7 @@ static	LRESULT G711_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ads
 	}
 	break;
     default:
-	WARN("Unsupported query %08lx\n", adss->fdwSize);
+	WARN("Unsupported query %08x\n", adss->fdwSize);
 	return MMSYSERR_NOTSUPPORTED;
     }
     FIXME("\n");
@@ -1075,7 +1075,7 @@ static LRESULT G711_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADE
 	  ACM_STREAMCONVERTF_END|
 	  ACM_STREAMCONVERTF_START))
     {
-	FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert);
+	FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert);
     }
     /* ACM_STREAMCONVERTF_BLOCKALIGN
      *	currently all conversions are block aligned, so do nothing for this flag