aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog17
-rw-r--r--linuxthreads/ChangeLog7
-rw-r--r--linuxthreads/pthread.c2
-rw-r--r--manual/llio.texi3
-rw-r--r--string/Versions3
-rw-r--r--string/bits/string2.h6
-rw-r--r--sysdeps/generic/inttypes.h2
-rw-r--r--sysdeps/generic/strsep.c1
8 files changed, 33 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a4bf26fb6..a1428043d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2001-10-04 Ben Collins <bcollins@debian.org>
+
+ * sysdeps/generic/inttypes.h: Fix typo (define, not defined) in
+ decleration of __need_wchar_t.
+
+2001-10-03 Jakub Jelinek <jakub@redhat.com>
+
+ * string/bits/string2.h (__strsep_g): Add prototype.
+ (__strsep): Use it.
+ * string/Versions (__strsep): Remove.
+ * sysdeps/generic/strsep.c (__strsep_g): Add alias to __strsep.
+
+2001-10-07 Ulrich Drepper <drepper@redhat.com>
+
+ * manua/llio.texi: Clarify file references added by mmap.
+ Patch by Marcus Brinkmann <Marcus.Brinkmann@ruhr-uni-bochum.de>.
+
2001-09-29 Jes Sorensen <jes@trained-monkey.org>
* sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h (struct sigcontext):
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index c864308804..0a330fa0e0 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-05 Kevin Buettner <kevinb@cygnus.com>
+
+ * pthread.c (__linuxthread_pthread_sizeof_descr): Change name
+ to __linuxthreads_pthread_sizeof_descr to match name used by
+ symbol_list_arr[LINUXTHREADS_PTHREAD_SIZEOF_DESCR] in
+ linuxthreads_db/td_symbol_list.c.
+
2001-09-22 Andreas Jaeger <aj@suse.de>
* linuxthreads/tst-context.c: Avoid compile warning.
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index f87413bc0f..b287dc8d03 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -211,7 +211,7 @@ const int __pthread_offsetof_descr = offsetof(struct pthread_handle_struct,
h_descr);
const int __pthread_offsetof_pid = offsetof(struct _pthread_descr_struct,
p_pid);
-const int __linuxthread_pthread_sizeof_descr
+const int __linuxthreads_pthread_sizeof_descr
= sizeof(struct _pthread_descr_struct);
/* Forward declarations */
diff --git a/manual/llio.texi b/manual/llio.texi
index ceadb7ed32..fbd30a31c6 100644
--- a/manual/llio.texi
+++ b/manual/llio.texi
@@ -1153,7 +1153,8 @@ These functions are declared in @file{sys/mman.h}.
The @code{mmap} function creates a new mapping, connected to bytes
(@var{offset}) to (@var{offset} + @var{length} - 1) in the file open on
-@var{filedes}.
+@var{filedes}. A new reference for the file specified by @var{filedes}
+is created, which is not removed by closing the file.
@var{address} gives a preferred starting address for the mapping.
@code{NULL} expresses no preference. Any previous mapping at that
diff --git a/string/Versions b/string/Versions
index 171b9c57c0..2708091a4d 100644
--- a/string/Versions
+++ b/string/Versions
@@ -73,7 +73,4 @@ libc {
# m*
memrchr;
}
- GLIBC_2.2.5 {
- __strsep;
- }
}
diff --git a/string/bits/string2.h b/string/bits/string2.h
index 0078af90bb..aafb578915 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -1087,6 +1087,8 @@ __strtok_r_1c (char *__s, char __sep, char **__nextp)
#if !defined _HAVE_STRING_ARCH_strsep || defined _FORCE_INLINES
# ifndef _HAVE_STRING_ARCH_strsep
+
+extern char *__strsep_g (char **__stringp, __const char *__delim);
# define __strsep(s, reject) \
__extension__ \
({ char __r0, __r1, __r2; \
@@ -1100,8 +1102,8 @@ __strtok_r_1c (char *__s, char __sep, char **__nextp)
? __strsep_2c (s, __r0, __r1) \
: (((__const char *) (reject))[3] == '\0' \
? __strsep_3c (s, __r0, __r1, __r2) \
- : __strsep (s, reject)))) \
- : __strsep (s, reject)); })
+ : __strsep_g (s, reject)))) \
+ : __strsep_g (s, reject)); })
# endif
__STRING_INLINE char *__strsep_1c (char **__s, char __reject);
diff --git a/sysdeps/generic/inttypes.h b/sysdeps/generic/inttypes.h
index f0ae7747cd..18264e7c12 100644
--- a/sysdeps/generic/inttypes.h
+++ b/sysdeps/generic/inttypes.h
@@ -34,7 +34,7 @@
# elif defined __WCHAR_TYPE__
typedef __WCHAR_TYPE__ __gwchar_t;
# else
-# defined __need_wchar_t
+# define __need_wchar_t
# include <stddef.h>
typedef wchar_t __gwchar_t;
# endif
diff --git a/sysdeps/generic/strsep.c b/sysdeps/generic/strsep.c
index 6744aa9867..5761eecd31 100644
--- a/sysdeps/generic/strsep.c
+++ b/sysdeps/generic/strsep.c
@@ -66,3 +66,4 @@ __strsep (char **stringp, const char *delim)
return begin;
}
weak_alias (__strsep, strsep)
+strong_alias (__strsep, __strsep_g)