Index: drm/libdrm.h
===================================================================
RCS file: /cvs/xserver/xserver/drm/libdrm.h,v
retrieving revision 1.2
diff -u -3 -r1.2 libdrm.h
--- drm/libdrm.h	29 Dec 2003 06:24:01 -0000	1.2
+++ drm/libdrm.h	20 Apr 2005 16:37:17 -0000
@@ -294,7 +294,7 @@
 #define DRM_LOCK_CONT  0x40000000 /**< Hardware lock is contended */
 
 #if defined(__GNUC__) && (__GNUC__ >= 2)
-# if defined(__i386) || defined(__AMD64__)
+# if defined(__i386) || defined(__amd64__)
 				/* Reflect changes here to drmP.h */
 #define DRM_CAS(lock,old,new,__ret)                                    \
 	do {                                                           \
Index: fb/fb.h
===================================================================
RCS file: /cvs/xserver/xserver/fb/fb.h,v
retrieving revision 1.43
diff -u -3 -r1.43 fb.h
--- fb/fb.h	2 Mar 2005 15:30:03 -0000	1.43
+++ fb/fb.h	20 Apr 2005 16:37:17 -0000
@@ -105,7 +105,7 @@
       defined(ia64) || defined(__ia64__) || \
       defined(__sparc64__) || \
       defined(__s390x__) || \
-      defined(AMD64) || defined (__AMD64__)
+      defined(amd64) || defined (__amd64__)
 typedef unsigned long	    FbBits;
 #  else
 typedef unsigned long long  FbBits;
Index: include/picture.h
===================================================================
RCS file: /cvs/xserver/xserver/include/picture.h,v
retrieving revision 1.23
diff -u -3 -r1.23 picture.h
--- include/picture.h	29 Jul 2004 08:10:15 -0000	1.23
+++ include/picture.h	20 Apr 2005 16:37:17 -0000
@@ -172,7 +172,7 @@
       defined(ia64) || defined(__ia64__) || \
       defined(__sparc64__) || \
       defined(__s390x__) || \
-      defined(AMD64) || defined (__AMD64__)
+      defined(amd64) || defined (__amd64__)
 typedef long		xFixed_32_32;
 # else
 #  if defined(__GNUC__) && \
Index: include/servermd.h
===================================================================
RCS file: /cvs/xserver/xserver/include/servermd.h,v
retrieving revision 3.55
diff -u -3 -r3.55 servermd.h
--- include/servermd.h	11 Sep 2003 05:12:51 -0000	3.55
+++ include/servermd.h	20 Apr 2005 16:37:17 -0000
@@ -403,7 +403,7 @@
 
 #endif /* ia64 */
 
-#if defined(__AMD64__) || defined(AMD64)
+#if defined(__amd64__) || defined(amd64)
 # define IMAGE_BYTE_ORDER	LSBFirst
 
 # if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
@@ -422,7 +422,7 @@
 # define FAST_CONSTANT_OFFSET_MODE
 /* ???? */
 # define FAST_UNALIGNED_READS
-#endif /* AMD64 */
+#endif /* amd64 */
 
 #ifdef stellar
 
@@ -482,6 +482,7 @@
 
 #ifndef GLYPHPADBYTES
 #define GLYPHPADBYTES           4
+#warning "Ok, setting GPB"
 #endif
 
 #define GETLEFTBITS_ALIGNMENT	1
Index: mi/micoord.h
===================================================================
RCS file: /cvs/xserver/xserver/mi/micoord.h,v
retrieving revision 1.7
diff -u -3 -r1.7 micoord.h
--- mi/micoord.h	11 Sep 2003 05:12:51 -0000	1.7
+++ mi/micoord.h	20 Apr 2005 16:37:17 -0000
@@ -50,7 +50,7 @@
     defined(__i386__) || defined(i386) || \
     defined(__ia64__) || defined(ia64) || \
     defined(__s390x__) || defined(__s390__) || \
-    defined(__AMD64__) || defined(AMD64)
+    defined(__amd64__) || defined(amd64)
 #define GetHighWord(x) (((int) (x)) >> 16)
 #else
 #define GetHighWord(x) (((int) (x)) / 65536)
Index: os/xalloc.c
===================================================================
RCS file: /cvs/xserver/xserver/os/xalloc.c,v
retrieving revision 3.36
diff -u -3 -r3.36 xalloc.c
--- os/xalloc.c	11 Sep 2003 05:12:51 -0000	3.36
+++ os/xalloc.c	20 Apr 2005 16:37:17 -0000
@@ -186,7 +186,7 @@
     defined(__ia64__) || defined(ia64) || \
     defined(__sparc64__) || \
     defined(__s390x__) || \
-    defined(__AMD64__) || defined(AMD64)
+    defined(__amd64__) || defined(amd64)
 #define MAGIC			0x1404196414071968
 #define MAGIC_FREE              0x1506196615061966
 #define MAGIC2			0x2515207525182079