diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:37:29 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:37:29 +0000 |
| commit | 03d893bff9bf5d6be9663a21cc983873d8e8d4c7 (patch) | |
| tree | b2cf580cde3a8b6025e8f236bede76126d623dce /hw/xfree86/utils/xorgcfg/config.h | |
| parent | 30ac3efde2c3f08b98f31833df4ea7d87f33b092 (diff) | |
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214
Diffstat (limited to 'hw/xfree86/utils/xorgcfg/config.h')
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/config.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/xfree86/utils/xorgcfg/config.h b/hw/xfree86/utils/xorgcfg/config.h index 0853b67fa..aa38d520f 100644 --- a/hw/xfree86/utils/xorgcfg/config.h +++ b/hw/xfree86/utils/xorgcfg/config.h @@ -26,8 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XdotOrg: 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.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> |