Charles Davis : winemac.drv: Don't print 32-bit values as long integers ( Clang).

Alexandre Julliard julliard at wine.codeweavers.com
Fri Feb 19 08:56:20 CST 2016


Module: wine
Branch: master
Commit: d2f7becc0f1394a8369f667f97096ceaa0db2122
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d2f7becc0f1394a8369f667f97096ceaa0db2122

Author: Charles Davis <cdavis5x at gmail.com>
Date:   Thu Feb 18 13:17:03 2016 -0700

winemac.drv: Don't print 32-bit values as long integers (Clang).

Signed-off-by: Charles Davis <cdavis5x at gmail.com>
Signed-off-by: Ken Thomases <ken at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winemac.drv/keyboard.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c
index 6f38885..6680e6b 100644
--- a/dlls/winemac.drv/keyboard.c
+++ b/dlls/winemac.drv/keyboard.c
@@ -1545,7 +1545,7 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState
     INT ret = 0;
     int keyc;
     BOOL is_menu = (flags & 0x1);
-    OSStatus status;
+    int status;
     const UCKeyboardLayout *uchr;
     UInt16 keyAction;
     UInt32 modifierKeyState;
@@ -1664,7 +1664,7 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState
         &len, bufW);
     if (status != noErr)
     {
-        ERR_(key)("Couldn't translate keycode 0x%04x, status %ld\n", keyc, status);
+        ERR_(key)("Couldn't translate keycode 0x%04x, status %d\n", keyc, status);
         goto done;
     }
     if (!is_menu)
@@ -1687,7 +1687,7 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState
             &savedDeadKeyState, bufW_size, &len, bufW);
         if (status != noErr)
         {
-            ERR_(key)("Couldn't translate keycode 0x%04x, status %ld\n", keyc, status);
+            ERR_(key)("Couldn't translate keycode 0x%04x, status %d\n", keyc, status);
             goto done;
         }
 




More information about the wine-cvs mailing list