(file) Return to Xos.h CVS log (file) (dir) Up to [XFree86 CVS] / xc / include

Diff for /xc/include/Xos.h between version 3.15 and 3.16

version 3.15, 1996/02/20 14:31:59 version 3.16, 1996/02/24 05:57:18
Line 1 
Line 1 
 /* /*
  * $XConsortium: Xos.h,v 1.68 95/06/02 16:51:21 gildea Exp $  * $XConsortium: Xos.h,v 1.68 95/06/02 16:51:21 gildea Exp $
  * $XFree86: xc/include/Xos.h,v 3.14 1996/01/24 21:56:44 dawes Exp $   * $XFree86: xc/include/Xos.h,v 3.15 1996/02/20 14:31:59 dawes Exp $
  *  *
  *  *
 Copyright (c) 1987  X Consortium Copyright (c) 1987  X Consortium
Line 68 
Line 68 
  * need to have #defines here.  * need to have #defines here.
  */  */
  
 #ifdef MINIX  
 /* Prevent accidents with struct members called 'index' */  
 #include <string.h>  
 #define index(s,c) (strchr((s),(c)))  
 #define rindex(s,c) (strrchr((s),(c)))  
 #endif  
   
 #ifndef X_NOT_STDC_ENV #ifndef X_NOT_STDC_ENV
  
 #if !(defined(sun) && !defined(SVR4))   /* 'index' is problem with K&R */  
 #include <string.h> #include <string.h>
   #ifdef __STDC__
 #ifndef index #ifndef index
 #define index(s,c) (strchr((s),(c))) #define index(s,c) (strchr((s),(c)))
 #endif #endif
 #ifndef rindex #ifndef rindex
 #define rindex(s,c) (strrchr((s),(c))) #define rindex(s,c) (strrchr((s),(c)))
   #endif
   #else
   #ifndef index
   #define index strchr
   #endif
   #ifndef rindex
   #define rindex strrchr
 #endif #endif
 #endif #endif
  


Legend:
Removed from v.3.15  
changed lines
  Added in v.3.16

Powered by
ViewCVS 0.9.2