diff -rc vnc_unixsrc.org/Xvnc/config/cf/linux.cf vnc_unixsrc/Xvnc/config/cf/linux.cf
*** vnc_unixsrc.org/Xvnc/config/cf/linux.cf	Tue Jan 31 11:22:43 2006
--- vnc_unixsrc/Xvnc/config/cf/linux.cf	Tue Jan 31 22:37:34 2006
***************
*** 295,301 ****
  #define OptimizedCDebugFlags	-O2
  #define LinuxMachineDefines 	-D__x86_64__
  #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
! #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
  #endif /* x86_64PCArchitecture */
  
  #ifdef ArmArchitecture
--- 295,301 ----
  #define OptimizedCDebugFlags	-O2
  #define LinuxMachineDefines 	-D__x86_64__
  #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
! #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
  #endif /* x86_64PCArchitecture */
  
  #ifdef ArmArchitecture
diff -rc vnc_unixsrc.org/Xvnc/include/Xmd.h vnc_unixsrc/Xvnc/include/Xmd.h
*** vnc_unixsrc.org/Xvnc/include/Xmd.h	Sun Jun 11 07:00:52 2000
--- vnc_unixsrc/Xvnc/include/Xmd.h	Tue Jan 31 15:15:02 2006
***************
*** 59,65 ****
  #ifdef CRAY
  #define WORD64				/* 64-bit architecture */
  #endif
! #if defined(__alpha) || defined(__alpha__)
  #define LONG64				/* 32/64-bit architecture */
  #endif
  #ifdef __sgi
--- 59,65 ----
  #ifdef CRAY
  #define WORD64				/* 64-bit architecture */
  #endif
! #if defined(__alpha) || defined(__alpha__) || defined(__x86_64__)
  #define LONG64				/* 32/64-bit architecture */
  #endif
  #ifdef __sgi
diff -rc vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c
*** vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c	Sun Jun 11 07:00:52 2000
--- vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c	Tue Jan 31 15:15:02 2006
***************
*** 79,85 ****
                  byte,
                  glyph,
                  scan;
!     int         sizes[GLYPHPADOPTIONS];
  {
      int         widthBits,
                  widthBytes,
--- 79,85 ----
                  byte,
                  glyph,
                  scan;
!     CARD32      sizes[GLYPHPADOPTIONS];
  {
      int         widthBits,
                  widthBytes,
diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c
*** vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c	Sun Jun 11 07:00:51 2000
--- vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c	Tue Jan 31 15:15:02 2006
***************
*** 404,409 ****
--- 404,410 ----
   */
  void
  NoopDDA(
+ #undef NeedVarargsPrototypes
  #if NeedVarargsPrototypes
      void* f, ...
  #endif
diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c
*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c	Tue Apr  8 17:18:33 2003
--- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c	Tue Jan 31 15:15:02 2006
***************
*** 39,44 ****
--- 39,45 ----
  #endif
  #if USE_LIBWRAP
  #include <tcpd.h>
+ #include <arpa/inet.h>
  #endif
  
  #include "rfb.h"
diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c
*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c	Fri Feb 27 06:22:47 2004
--- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c	Tue Jan 31 15:15:02 2006
***************
*** 80,85 ****
--- 80,86 ----
  #include <sys/param.h>
  #include "dix.h"
  #include "rfb.h"
+ #include <time.h>
  
  #ifdef CORBA
  #include <vncserverctrl.h>
diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h
*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h	Fri Feb 27 06:22:47 2004
--- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h	Tue Jan 31 15:15:02 2006
***************
*** 30,35 ****
--- 30,36 ----
  #include <rfbproto.h>
  #include <vncauth.h>
  #include <zlib.h>
+ #include <stdarg.h>
  
  /* It's a good idea to keep these values a bit greater than required. */
  #define MAX_ENCODINGS 10
diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c
*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c	Sun Oct 27 06:36:02 2002
--- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c	Tue Jan 31 15:15:02 2006
***************
*** 42,47 ****
--- 42,48 ----
  #include <sys/time.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
+ #include <arpa/inet.h>
  #include <netinet/tcp.h>
  #include <netdb.h>
  #include <fcntl.h>
diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h
*** vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h	Sun Jun 11 07:00:52 2000
--- vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h	Tue Jan 31 15:15:02 2006
***************
*** 479,484 ****
--- 479,485 ----
  );
  
  extern void NoopDDA(
+ #undef NeedVarargsPrototypes
  #if NeedVarargsPrototypes
      void *,
      ...
diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h
*** vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h	Wed Feb 19 10:39:54 2003
--- vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h	Tue Jan 31 17:05:16 2006
***************
*** 374,379 ****
--- 374,398 ----
  #define NO_ONE_RECT
  #endif
  
+ /* Values for AMD Opteron and Intel 64 bit extensions. Copied from Alpha.
+  */
+ #ifdef __x86_64__
+ #  define BITMAP_SCANLINE_UNIT			64
+ # define BITMAP_SCANLINE_PAD 			64
+ # define LOG2_BITMAP_PAD			6
+ # define LOG2_BYTES_PER_SCANLINE_PAD		3
+ 
+ /* Add for handling protocol XPutImage and XGetImage; see comment in
+  * Alpha section.
+  */
+ #define INTERNAL_VS_EXTERNAL_PADDING
+ #define BITMAP_SCANLINE_UNIT_PROTO		32
+ 
+ #define BITMAP_SCANLINE_PAD_PROTO 	 	32
+ #define LOG2_BITMAP_PAD_PROTO			5
+ #define LOG2_BYTES_PER_SCANLINE_PAD_PROTO	2
+ #endif
+ 
  #endif /* SVR4 / BSD / i386 */
  
  #if defined (linux) && defined (__mc68000__)