diff -ru xemacs-21.5.24.orig/src/eval.c xemacs-21.5.24/src/eval.c
--- xemacs-21.5.24.orig/src/eval.c	2005-12-27 18:12:06.000000000 +0100
+++ xemacs-21.5.24/src/eval.c	2006-02-17 12:22:23.000000000 +0100
@@ -136,6 +136,7 @@
 */
 
 #include <config.h>
+#include <stdint.h>
 #include "lisp.h"
 
 #include "commands.h"
@@ -5974,13 +5975,13 @@
   Lisp_Object opaque = XCAR (cons);
   Lisp_Object lval = XCDR (cons);
   int *addr = (int *) get_opaque_ptr (opaque);
-  int val;
+  intptr_t val;
 
   if (INTP (lval))
     val = XINT (lval);
   else
     {
-      val = (int) get_opaque_ptr (lval);
+      val = (intptr_t) get_opaque_ptr (lval);
       free_opaque_ptr (lval);
     }
 
diff -ru xemacs-21.5.24.orig/src/event-unixoid.c xemacs-21.5.24/src/event-unixoid.c
--- xemacs-21.5.24.orig/src/event-unixoid.c	2003-02-07 12:50:53.000000000 +0100
+++ xemacs-21.5.24/src/event-unixoid.c	2006-02-17 12:50:18.000000000 +0100
@@ -27,6 +27,7 @@
 /* This file has been Mule-ized. */
 
 #include <config.h>
+#include <stdint.h>
 #include "lisp.h"
 
 #include "console-stream-impl.h"
@@ -361,9 +362,9 @@
   /* Decode inhandle and outhandle. Their meaning depends on
      the process implementation being used. */
   /* We are passed plain old file descs */
-  infd  = (int) inhandle;
-  outfd = (int) outhandle;
-  errfd = (int) errhandle;
+  infd  = (int) (intptr_t) inhandle;
+  outfd = (int) (intptr_t) outhandle;
+  errfd = (int) (intptr_t) errhandle;
 
   *instream = (infd >= 0
 	       ? make_filedesc_input_stream (infd, 0, -1, 0)
diff -ru xemacs-21.5.24.orig/src/input-method-xlib.c xemacs-21.5.24/src/input-method-xlib.c
--- xemacs-21.5.24.orig/src/input-method-xlib.c	2005-01-25 00:33:59.000000000 +0100
+++ xemacs-21.5.24/src/input-method-xlib.c	2006-02-17 12:54:58.000000000 +0100
@@ -70,6 +70,7 @@
  */
 
 #include <config.h>
+#include <stdint.h>
 #include "lisp.h"
 
 #include "buffer.h"
@@ -708,7 +709,7 @@
 
   if (converter_data)
     {
-      Boolean free_p    = (Boolean) (int) converter_data;
+      Boolean free_p    = (Boolean) (int) (intptr_t) converter_data;
       XIMStyles *styles = (XIMStyles *) toVal->addr;
       if (free_p)
         XFree ( styles->supported_styles );
diff -ru xemacs-21.5.24.orig/src/process-unix.c xemacs-21.5.24/src/process-unix.c
--- xemacs-21.5.24.orig/src/process-unix.c	2005-02-04 05:06:34.000000000 +0100
+++ xemacs-21.5.24/src/process-unix.c	2006-02-17 12:56:36.000000000 +0100
@@ -31,6 +31,7 @@
    written by Wolfgang S. Rupprecht */
 
 #include <config.h>
+#include <stdlib.h>
 
 #if !defined (NO_SUBPROCESSES)
 
@@ -846,8 +847,8 @@
 unix_init_process_io_handles (Lisp_Process *p, void *in, void *UNUSED (out),
 			      void *err, int UNUSED (flags))
 {
-  UNIX_DATA(p)->infd = (int) in;
-  UNIX_DATA(p)->errfd = (int) err;
+  UNIX_DATA(p)->infd = (int) (intptr_t) in;
+  UNIX_DATA(p)->errfd = (int) (intptr_t) err;
 }
 
 /* Move the file descriptor FD so that its number is not less than MIN. *