--- rfb.h.orig	Thu Dec  6 15:25:36 2007
+++ rfb.h	Thu Dec  6 15:25:37 2007
@@ -34,10 +34,10 @@
 
 // Define the CARD* types as used in X11/Xmd.h
 
-typedef unsigned long CARD32;
-typedef unsigned short CARD16;
-typedef short INT16;
-typedef unsigned char  CARD8;
+typedef uint32_t CARD32;
+typedef uint16_t CARD16;
+typedef int16_t INT16;
+typedef uint8_t CARD8;
 
 // Define the port number offsets
 #define FLASH_PORT_OFFSET 5400
