[Xorg-commit] xc/programs/Xserver/hw/xfree86/xf86cfg config.h,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

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

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


Index: config.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/config.h	20 Dec 2003 00:28:31 -0000	1.1.4.2
+++ b/config.h	23 Feb 2004 21:37:13 -0000	1.1.4.3
@@ -26,8 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa at conectiva.com.br>
  *
- * $XdotOrg$
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.18 2003/12/19 02:05:38 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.22 2004/02/14 17:53:49 dawes Exp $
  */
 
 #include <X11/IntrinsicP.h>
@@ -38,10 +37,12 @@
 #include <stdlib.h>
 #include <dirent.h>
 #include <string.h>
-#include <unistd.h>
-#if defined(sun) && defined(SVR4)
+#ifdef sun
+#undef index
+#undef rindex
 #include <strings.h>
 #endif
+#include <unistd.h>
 
 #include <stdarg.h>