diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | include/stdlib.h | 30 | ||||
| -rw-r--r-- | nptl/ChangeLog | 4 | ||||
| -rw-r--r-- | nptl/tst-cancel24.cc | 4 |
4 files changed, 25 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog index 28c72f05ce..f96202eb6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-01-04 Ulrich Drepper <drepper@redhat.com> + + * include/stdlib.h: Make even more C++ compliant. + 2006-01-04 Joseph S. Myers <joseph@codesourcery.com> * sysdeps/unix/sysv/linux/mips/brk.c (__brk): Use diff --git a/include/stdlib.h b/include/stdlib.h index 90b779d895..89bee37c0a 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -144,44 +144,44 @@ libc_hidden_proto (____strtoul_l_internal) libc_hidden_proto (____strtoull_l_internal) extern __inline double -__strtod_l (__const char *__restrict __nptr, char **__restrict __endptr, - __locale_t __loc) +__NTH (__strtod_l (__const char *__restrict __nptr, char **__restrict __endptr, + __locale_t __loc)) { return ____strtod_l_internal (__nptr, __endptr, 0, __loc); } extern __inline long int -__strtol_l (__const char *__restrict __nptr, char **__restrict __endptr, - int __base, __locale_t __loc) +__NTH (__strtol_l (__const char *__restrict __nptr, char **__restrict __endptr, + int __base, __locale_t __loc)) { return ____strtol_l_internal (__nptr, __endptr, __base, 0, __loc); } extern __inline unsigned long int -__strtoul_l (__const char *__restrict __nptr, char **__restrict __endptr, - int __base, __locale_t __loc) +__NTH (__strtoul_l (__const char *__restrict __nptr, + char **__restrict __endptr, int __base, __locale_t __loc)) { return ____strtoul_l_internal (__nptr, __endptr, __base, 0, __loc); } extern __inline float -__strtof_l (__const char *__restrict __nptr, char **__restrict __endptr, - __locale_t __loc) +__NTH (__strtof_l (__const char *__restrict __nptr, char **__restrict __endptr, + __locale_t __loc)) { return ____strtof_l_internal (__nptr, __endptr, 0, __loc); } extern __inline long double -__strtold_l (__const char *__restrict __nptr, char **__restrict __endptr, - __locale_t __loc) +__NTH (__strtold_l (__const char *__restrict __nptr, + char **__restrict __endptr, __locale_t __loc)) { return ____strtold_l_internal (__nptr, __endptr, 0, __loc); } __extension__ extern __inline long long int -__strtoll_l (__const char *__restrict __nptr, char **__restrict __endptr, - int __base, __locale_t __loc) +__NTH (__strtoll_l (__const char *__restrict __nptr, + char **__restrict __endptr, int __base, __locale_t __loc)) { return ____strtoll_l_internal (__nptr, __endptr, __base, 0, __loc); } __extension__ extern __inline unsigned long long int -__strtoull_l (__const char * __restrict __nptr, char **__restrict __endptr, - int __base, __locale_t __loc) +__NTH (__strtoull_l (__const char * __restrict __nptr, + char **__restrict __endptr, int __base, __locale_t __loc)) { return ____strtoull_l_internal (__nptr, __endptr, __base, 0, __loc); } @@ -196,7 +196,7 @@ __strtoull_l (__const char * __restrict __nptr, char **__restrict __endptr, #endif -extern void * __default_morecore (ptrdiff_t); +extern void *__default_morecore (ptrdiff_t) __THROW; libc_hidden_proto (__default_morecore) __END_DECLS diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 65de3506a8..3eb63f02b4 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2006-01-04 Ulrich Drepper <drepper@redhat.com> + + * tst-cancel24.cc: Use C headers instead of C++ headers. + 2006-01-03 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/sparc/lowlevellock.h: Remove #error for diff --git a/nptl/tst-cancel24.cc b/nptl/tst-cancel24.cc index 52cf079d5a..1af709a8ca 100644 --- a/nptl/tst-cancel24.cc +++ b/nptl/tst-cancel24.cc @@ -1,7 +1,7 @@ -#include <cstdlib> -#include <cstdio> #include <pthread.h> #include <semaphore.h> +#include <stdlib.h> +#include <stdio.h> #include <unistd.h> |