about summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorWilco Dijkstra <wdijkstr@arm.com>2017-02-06 18:14:16 +0000
committerWilco Dijkstra <wdijkstr@arm.com>2017-02-06 18:15:18 +0000
commitc7a37ad352c90d798d138b9f83e0333c78d08410 (patch)
treee6946eed9f90ca89dd2660a8f1360961cffc9eb5 /include
parent5a68e857bf1b64c2576bbf32429aed5162e90bb9 (diff)
downloadglibc-c7a37ad352c90d798d138b9f83e0333c78d08410.tar.gz
glibc-c7a37ad352c90d798d138b9f83e0333c78d08410.tar.xz
glibc-c7a37ad352c90d798d138b9f83e0333c78d08410.zip
As a minor cleanup remove the (r)index defines from include/string.h as
they are only used internally in a few places.  Rename all uses that
occur in GLIBC.

	* hurd/path-lookup.c (file_name_path_scan): Rename index to strchr.
	* include/string.h (index): Remove define.
	(rindex): Likewise.
	* misc/getttyent.c (__getttyent): Rename index to strchr.
	* misc/ttyslot.c (ttyslot): Rename rindex to strrchr.
	* sunrpc/rpc_main.c (mkfile_output): Likewise.
Diffstat (limited to 'include')
-rw-r--r--include/string.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/string.h b/include/string.h
index 300a2e2faa..07389f3278 100644
--- a/include/string.h
+++ b/include/string.h
@@ -160,15 +160,6 @@ extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy");
 extern __typeof (stpcpy) stpcpy __asm__ ("__stpcpy");
 #endif
 
-# ifndef _ISOMAC
-#  ifndef index
-#   define index(s, c)	(strchr ((s), (c)))
-#  endif
-#  ifndef rindex
-#   define rindex(s, c)	(strrchr ((s), (c)))
-#  endif
-# endif
-
 extern void *__memcpy_chk (void *__restrict __dest,
 			   const void *__restrict __src, size_t __len,
 			   size_t __destlen) __THROW;