[Xorg-commit] xc/extras/Mesa/src/X xm_api.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/extras/Mesa/src/X
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/extras/Mesa/src/X

Modified Files:
      Tag: XORG-CURRENT
	xm_api.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: xm_api.c
===================================================================
RCS file: /cvs/xorg/xc/extras/Mesa/src/X/xm_api.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/xm_api.c	26 Nov 2003 22:48:19 -0000	1.1.4.1
+++ b/xm_api.c	23 Feb 2004 21:31:56 -0000	1.1.4.2
@@ -21,7 +21,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/extras/Mesa/src/X/xm_api.c,v 1.9 2003/11/06 18:37:53 tsi Exp $ */
+/* $XFree86: xc/extras/Mesa/src/X/xm_api.c,v 1.10 2003/12/22 17:48:01 tsi Exp $ */
 
 /*
  * This file contains the implementations of all the XMesa* functions.
@@ -174,7 +174,7 @@
 /*
  * Error handling.
  */
-#ifndef XFree86Server
+#if !defined(XFree86Server) && defined(USE_XSHM)
 static volatile int mesaXErrorFlag = 0;
 
 static int mesaHandleXError( XMesaDisplay *dpy, XErrorEvent *event )