[Xorg-commit] xc/programs/Xserver/hw/xfree86/drivers/apm apm_rush.c,1.1,1.1.4.1

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/apm
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/hw/xfree86/drivers/apm

Modified Files:
      Tag: XORG-CURRENT
	apm_rush.c 
Log Message:
First pass at "Standard" Xinerama.
The sources for this came from Heather Lanigan's xinerama tree on 
Sourceforge.Net. 
No attempt has been made to handle previous, non-standard versions of 
the protocol. Nor has any attempt been made to preserve the ABI of 
previous versions -- that part will be added at a later time, and 
then probably only on systems that have nice object/linker semantics, 
e.g. ELF systems with weak symbols.



Index: apm_rush.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- apm_rush.c	14 Nov 2003 16:48:55 -0000	1.1
+++ apm_rush.c	18 Dec 2003 19:29:14 -0000	1.1.4.1
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.12 2003/02/12 21:46:42 tsi Exp $ */
 /*
  * Copyright Loïc Grenié 1999
@@ -345,8 +346,8 @@
 {
     ExtensionEntry* extEntry;
 
-#ifdef PANORAMIX
-    if (!noPanoramiXExtension)
+#ifdef XINERAMA
+    if (!noXineramaExtension)
 	return;
 #endif
     if (rush_ext_generation == serverGeneration) {