Index: xf86dri.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/dri/xf86dri.c,v
retrieving revision 1.12
diff -u -r1.12 xf86dri.c
--- xf86dri.c	24 Sep 2005 18:45:45 -0000	1.12
+++ xf86dri.c	10 Nov 2005 05:21:00 -0000
@@ -212,7 +212,11 @@
                   ((rep.busIdStringLength + 3) & ~3)) >> 2;
 
     rep.hSAREALow  = (CARD32)(hSAREA & 0xffffffff);
+#if defined(LONG64) && !defined(__linux__)
+    rep.hSAREAHigh = (CARD32)(hSAREA >> 32);
+#else
     rep.hSAREAHigh = 0;
+#endif
 
     WriteToClient(client, sizeof(xXF86DRIOpenConnectionReply), (char *)&rep);
     if (rep.busIdStringLength)
@@ -546,7 +550,11 @@
     }
 
     rep.hFrameBufferLow  = (CARD32)(hFrameBuffer & 0xffffffff);
+#if defined(LONG64) && !defined(__linux__)
+    rep.hFrameBufferHigh = (CARD32)(hFrameBuffer >> 32);
+#else
     rep.hFrameBufferHigh = 0;
+#endif
 
     rep.length = 0;
     if (rep.devPrivateSize) {