summaryrefslogtreecommitdiff
path: root/fb/fb.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 19:54:30 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 19:54:30 +0000
commit2fb588620030ad393f8500d60e16144d59e4effe (patch)
tree07262cbe15a40e5aeae54f62751260f83243ab79 /fb/fb.h
parent0664db19bf37f9dd69cca6adff4e238e310c3092 (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'fb/fb.h')
-rw-r--r--fb/fb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fb/fb.h b/fb/fb.h
index c9633d248..f90a3499e 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.37 2003/11/03 05:11:00 tsi Exp $
+ * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.36tsi Exp $
*
* Copyright © 1998 Keith Packard
*
@@ -105,7 +105,7 @@ typedef unsigned __int64 FbBits;
defined(ia64) || defined(__ia64__) || \
defined(__sparc64__) || \
defined(__s390x__) || \
- defined(AMD64) || defined (__AMD64__) || \
+ defined(amd64) || defined (__amd64__) || \
(defined(sgi) && (_MIPS_SZLONG == 64))
typedef unsigned long FbBits;
# else