Don't #define index strchr in a public include file

5 files changed, 75 insertions, 0 deletions

diff --git a/graphics/urt/patches/patch-ae b/graphics/urt/patches/patch-ae
new file mode 100644
index 00000000000..67045130208
--- /dev/null
+++ b/graphics/urt/patches/patch-ae
@@ -0,0 +1,22 @@
+--- include/rle_config.tlr	Wed Nov 25 23:51:33 1998
++++ include/rle_config.tlr	Wed Nov 25 23:53:33 1998
+@@ -91,15 +91,15 @@
+ #ifdef USE_STRING_H
+     /* SYS V string routines. */
+ #   include <string.h>
+-#   define index strchr
+-#   define rindex strrchr
++#   define rle_index strchr
++#   define rle_rindex strrchr
+ #else
+     /* BSD string routines. */
+ #   include <strings.h>
+ /* Really, should define USE_STRING_H if __STDC__, but be safe. */
+ #ifdef __STDC__
+-#   define index strchr
+-#   define rindex strrchr
++#   define rle_index strchr
++#   define rle_rindex strrchr
+ #endif /* __STDC__ */
+ #endif /* USE_STRING_H */
+ 
diff --git a/graphics/urt/patches/patch-af b/graphics/urt/patches/patch-af
new file mode 100644
index 00000000000..ba4289b587a
--- /dev/null
+++ b/graphics/urt/patches/patch-af
@@ -0,0 +1,11 @@
+--- cnv/xbmtorle.c~	Thu Apr 30 07:01:54 1992
++++ cnv/xbmtorle.c	Wed Nov 25 23:56:38 1998
+@@ -206,7 +206,7 @@
+ 
+ 	if ( sscanf( line, "#define %s %d", name_and_type, &v ) == 2 )
+ 	{
+-	    if ( ! (t = rindex( name_and_type, '_' )) )
++	    if ( ! (t = rle_rindex( name_and_type, '_' )) )
+ 		t = name_and_type;
+ 	    else
+ 		t++;
diff --git a/graphics/urt/patches/patch-ag b/graphics/urt/patches/patch-ag
new file mode 100644
index 00000000000..2f25b70fb54
--- /dev/null
+++ b/graphics/urt/patches/patch-ag
@@ -0,0 +1,20 @@
+--- lib/getopt.c~	Tue Jan 28 10:18:23 1992
++++ lib/getopt.c	Wed Nov 25 23:57:31 1998
+@@ -31,8 +31,6 @@
+ 
+ static char	*scan = NULL;	/* Private scan pointer. */
+ 
+-extern char	*index();
+-
+ int
+ getopt(argc, argv, optstring)
+ int argc;
+@@ -62,7 +60,7 @@
+     }
+     
+     c = *scan++;
+-    place = index(optstring, c);
++    place = rle_index(optstring, c);
+     
+     if (place == NULL || c == ':') {
+ 	fprintf(stderr, "%s: unknown option -%c\n", argv[0], c);
diff --git a/graphics/urt/patches/patch-ah b/graphics/urt/patches/patch-ah
new file mode 100644
index 00000000000..a8cb0f86fbc
--- /dev/null
+++ b/graphics/urt/patches/patch-ah
@@ -0,0 +1,11 @@
+--- tools/into.c~	Wed Nov 25 23:51:32 1998
++++ tools/into.c	Wed Nov 25 23:58:09 1998
+@@ -75,7 +75,7 @@
+ 	exit(1);
+     }
+ 
+-    if ( (cp = rindex( argv[1], '/' )) != NULL )
++    if ( (cp = rle_rindex( argv[1], '/' )) != NULL )
+     {
+ 	c = *++cp;
+ 	*cp = 0;
diff --git a/graphics/urt/patches/patch-ai b/graphics/urt/patches/patch-ai
new file mode 100644
index 00000000000..270b79fea7a
--- /dev/null
+++ b/graphics/urt/patches/patch-ai
@@ -0,0 +1,11 @@
+--- tools/rlehdr.c~	Thu Apr 30 07:12:10 1992
++++ tools/rlehdr.c	Wed Nov 25 23:58:39 1998
+@@ -287,7 +287,7 @@
+ 	    for ( ; ncomment > 0; ncomment--, comment_names++ )
+ 		if (the_comment = rle_getcom( *comment_names, the_hdr ))
+ 		{
+-		    if ( (cp = index( the_comment, '\n' )) )
++		    if ( (cp = rle_index( the_comment, '\n' )) )
+ 			printf( ", %s=%.*s", *comment_names,
+ 				cp - the_comment - 1, the_comment );
+ 		    else