summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-30 14:23:10 +0000
committerEgbert Eich <eich@suse.de>2004-03-30 14:23:10 +0000
commit8f4861aeee5a0c1d1946e3dfb193876cd1fc4c71 (patch)
tree83af6ae35b74b53808b11af7046aecd62df3a3e9
parent779061e4ca566dbc34f7ceade7daad41b9773d99 (diff)
36. Conversion: __AMD64__ > __amd64__ (Egbert Eich).XORG-CURRENT-premerge-release-1
35. Fixed stretching option and centering in C&T driver (Egbert Eich). 34. Added support for memory size tweaking in BIOS for i845 (Egbert Eich, thanks to Christian Ziez) 33. Removed video playback dependency on Accel in NSC drivers (Egbert 3Eich). 32. Fix HW cursor state on Savage driver when entering VT as some BIOSes seem to enable it unconditionally (Egbert Eich). 31. Fixed Emulate3Button message to distinguish between 'hard' (ie. configured) and 'soft' (ie. automatic emulation that is disabled as soon as the middle button is pressed) (Egbert Eich). 30. Free XrmDB in XCloseDisplay() only when implicitely allocated by XGetDefaults(). If Client allocates it itself it should free it also. Trying to free it for the client may result in segfault if the client has already freed it (Egbert Eich).
-rw-r--r--Imake.cf10
-rw-r--r--linux.cf4
2 files changed, 7 insertions, 7 deletions
diff --git a/Imake.cf b/Imake.cf
index d4cf6bd..dcdf6a4 100644
--- a/Imake.cf
+++ b/Imake.cf
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: xc/config/cf/Imake.cf,v 1.1.4.5 2003/12/20 00:28:21 kaleb Exp $
+XCOMM $XdotOrg: xc/config/cf/Imake.cf,v 1.1.4.6 2004/02/23 21:31:43 kaleb Exp $
XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
/*
* To add support for another platform:
@@ -904,13 +904,13 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# define s390xArchitecture
# undef __s390x__
# endif
-# if defined(__AMD64__) || defined (__x86_64__)
-# undef __AMD64__
+# if defined(__amd64__) || defined (__x86_64__)
+# undef __amd64__
# undef __x86_64__
# define AMD64Architecture
# endif
-# if defined(AMD64__) || defined (x86_64__)
-# undef AMD64__
+# if defined(amd64__) || defined (x86_64__)
+# undef amd64__
# undef x86_64__
# ifndef AMD64Architecture
# define AMD64Architecture
diff --git a/linux.cf b/linux.cf
index 85d4185..434a846 100644
--- a/linux.cf
+++ b/linux.cf
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.1.4.4 2003/12/20 00:28:21 kaleb Exp $
+XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.1.4.5 2004/02/23 21:31:43 kaleb Exp $
XCOMM platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
@@ -900,7 +900,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
# ifndef OptimizedCDebugFlags
# define OptimizedCDebugFlags DefaultGcc2AMD64Opt
# endif
-# define LinuxMachineDefines -D__AMD64__
+# define LinuxMachineDefines -D__amd64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* AMD64Architecture */