about summary refs log tree commit diff
path: root/string/string.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-03-20 12:06:55 +0000
committerUlrich Drepper <drepper@redhat.com>1998-03-20 12:06:55 +0000
commit89a9e37b7a7a2134cedb6d27db265a8ab774f9d1 (patch)
tree19131b4a9aa63f7737c683a57a00b1b37bf7b701 /string/string.h
parent9c1a1da9866c22c1626f2222cf5d03ef1b0ede3b (diff)
downloadglibc-89a9e37b7a7a2134cedb6d27db265a8ab774f9d1.tar.gz
glibc-89a9e37b7a7a2134cedb6d27db265a8ab774f9d1.tar.xz
glibc-89a9e37b7a7a2134cedb6d27db265a8ab774f9d1.zip
Update.
1998-03-20 11:58  Ulrich Drepper  <drepper@cygnus.com>

	* dirent/Makefile (routines): Add scandir64, alphasort64, and
	versionsort64.
	* dirent/alphasort64.c: New file.
	* dirent/scandir64.c: New file.
	* dirent/versionsort64.c: New file.
	* dirent/dirent.h: Add LFS support for scandir, alphasort, and
	versionsort.
	* sysdeps/generic/readdir64.c: Rename to __readdir64 and make
	old name weak alias.
	* sysdeps/unix/sysv/linux/readdir64.c: Likewise.

	* dirent/alphasort.c: Use strcoll instead of strcmp.

	* dirent/scandir.c: Optimize a bit.

	* dirent/versionsort.c: Pretty print.

1998-03-20  Ulrich Drepper  <drepper@cygnus.com>

	* string/string.h: Add prototype for __strtok_r.
Diffstat (limited to 'string/string.h')
-rw-r--r--string/string.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/string/string.h b/string/string.h
index 51144696ca..b8c33b00b1 100644
--- a/string/string.h
+++ b/string/string.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 95, 96, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 95, 96, 97, 98 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -167,9 +167,11 @@ extern char *strcasestr __P ((__const char *__haystack,
 extern char *strtok __P ((char *__restrict __s,
 			  __const char *__restrict __delim));
 
-#if defined __USE_POSIX || defined __USE_MISC
 /* Divide S into tokens separated by characters in DELIM.  Information
    passed between calls are stored in SAVE_PTR.  */
+extern char *__strtok_r __P ((char *__s, __const char *__delim,
+			      char **__save_ptr));
+#if defined __USE_POSIX || defined __USE_MISC
 extern char *strtok_r __P ((char *__s, __const char *__delim,
 			    char **__save_ptr));
 #endif