diff src/win32.c @ 5921:68639fb08af8 cygwin

no obvious 64 vs. 32 pblms in compilation, but still crashing in event-msw
author Henry Thompson <ht@markup.co.uk>
date Wed, 23 Apr 2014 22:22:37 +0100
parents 56144c8593a8
children
line wrap: on
line diff
--- a/src/win32.c	Mon Apr 21 11:42:50 2014 +0100
+++ b/src/win32.c	Wed Apr 23 22:22:37 2014 +0100
@@ -256,7 +256,7 @@
 	  if (no_recurse)
 	    return emacs_sprintf_string
 	      ("Unknown error code %d (error return %ld from FormatMessage())",
-	       errnum, GetLastError ());
+	       errnum, (long)GetLastError ());
 	  else
 	    return emacs_sprintf_string
 	      ("Unknown error code %d (error return %s from FormatMessage())",
@@ -349,7 +349,7 @@
     if (STRINGP (document))
       LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR (document, doc);
 
-    ret = (int) qxeShellExecute (NULL, opext, doc, parmext, path,
+    ret = (intptr_t) qxeShellExecute (NULL, opext, doc, parmext, path,
 				 (FIXNUMP (show_flag) ?
 				  XFIXNUM (show_flag) : SW_SHOWDEFAULT));
   }
@@ -775,8 +775,8 @@
 MMRESULT tid_prof = 0;
 
 static void CALLBACK
-setitimer_helper_proc (UINT UNUSED (uID), UINT UNUSED (uMsg), DWORD dwUser,
-		       DWORD UNUSED (dw1), DWORD UNUSED (dw2))
+setitimer_helper_proc (UINT UNUSED (uID), UINT UNUSED (uMsg), DWORD_PTR dwUser,
+		       DWORD_PTR UNUSED (dw1), DWORD_PTR UNUSED (dw2))
 {
   /* Just raise the signal indicated by the dwUser parameter */
   mswindows_raise (dwUser);