diff options
author | Ulrich Drepper <drepper@redhat.com> | 2004-09-07 22:33:37 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2004-09-07 22:33:37 +0000 |
commit | f377d02227448a6f0d97eaf48ba60483c2f27e98 (patch) | |
tree | dc3fa6ae400c4a26e8757fc1bfadce3ab5f4d018 /wcsmbs/wchar.h | |
parent | 36ccb375a7f4db3ef66a0115961cfef23befa0e6 (diff) | |
download | glibc-f377d02227448a6f0d97eaf48ba60483c2f27e98.zip glibc-f377d02227448a6f0d97eaf48ba60483c2f27e98.tar.gz glibc-f377d02227448a6f0d97eaf48ba60483c2f27e98.tar.bz2 |
Update.
* include/atomic.h: Define atomic_increment_val, atomic_decrement_val,
and atomic_dealy is not already defined.
* sysdeps/i386/i486/bits/atomic.h: Define atomic_delay.
* sysdeps/x86_64/bits/atomic.h: Likewise.
* miscd/sys/cdefs.h (__NTH): New macro.
(__THROW): Define using nothrow attribute for C code and gcc >= 3.2.
(__REDIRECT_NTH): New macro.
* argp/argp.h: Use __NTH and __REDIRECT_NTH where necessary.
* ctype/ctype.h: Likewise.
* dirent/dirent.h: Likewise.
* io/fcntl.h: Likewise.
* io/sys/sendfile.h: Likewise.
* io/sys/stat.h: Likewise.
* io/sys/statfs.h: Likewise.
* io/sys/statvfs.h: Likewise.
* libio/bits/stdio.h: Likewise.
* misc/sys/mman.h: Likewise.
* posix/unistd.h: Likewise.
* resource/sys/resource.h: Likewise.
* rt/aio.h: Likewise.
* signal/signal.h: Likewise.
* stdlib/stdlib.h: Likewise.
* string/argz.h: Likewise.
* string/string.h: Likewise.
* sysdeps/generic/inttypes.h: Likewise.
* sysdeps/i386/fpu/bits/mathinline.h: Likewise.
* sysdeps/powerpc/fpu/bits/mathinline.h: Likewise.
* sysdeps/s390/fpu/bits/mathinline.h: Likewise.
* sysdeps/x86_64/fpu/bits/mathinline.h: Likewise.
* sysdeps/unix/sysv/linux/bits/socket.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sys/sysmacros.h: Likewise.
* wcsmbs/wchar.h: Likewise.
* sysdeps/generic/glob.c: Use __PMT isntead of __P where appropriate.
* resolv/gethnamaddr.c (getanswer): Remove __P use in variable
definition.
* io/sys/poll.h: Remove __THROW from poll prototype, it's a
cancellation point.
Diffstat (limited to 'wcsmbs/wchar.h')
-rw-r--r-- | wcsmbs/wchar.h | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 8bab0dd..1fe7e94 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1995-2002, 2003, 2004 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 @@ -320,8 +320,9 @@ __END_NAMESPACE_C99 #ifdef __USE_EXTERN_INLINES /* Define inline function as optimization. */ -extern __inline size_t mbrlen (__const char *__restrict __s, size_t __n, - mbstate_t *__restrict __ps) __THROW +extern __inline size_t +__NTH (mbrlen (__const char *__restrict __s, size_t __n, + mbstate_t *__restrict __ps)) { return (__ps != NULL ? mbrtowc (NULL, __s, __n, __ps) : __mbrlen (__s, __n, NULL)); } #endif @@ -525,38 +526,40 @@ extern unsigned long long int __wcstoull_internal (__const wchar_t * /* Define inline functions which call the internal entry points. */ __BEGIN_NAMESPACE_C99 -extern __inline double wcstod (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr) __THROW +extern __inline double +__NTH (wcstod (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr)) { return __wcstod_internal (__nptr, __endptr, 0); } -extern __inline long int wcstol (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, - int __base) __THROW +extern __inline long int +__NTH (wcstol (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __base)) { return __wcstol_internal (__nptr, __endptr, __base, 0); } -extern __inline unsigned long int wcstoul (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, - int __base) __THROW +extern __inline unsigned long int +__NTH (wcstoul (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __base)) { return __wcstoul_internal (__nptr, __endptr, __base, 0); } __END_NAMESPACE_C99 # ifdef __USE_GNU -extern __inline float wcstof (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr) __THROW +extern __inline float +__NTH (wcstof (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr)) { return __wcstof_internal (__nptr, __endptr, 0); } -extern __inline long double wcstold (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr) __THROW +extern __inline long double +__NTH (wcstold (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr)) { return __wcstold_internal (__nptr, __endptr, 0); } __extension__ -extern __inline long long int wcstoq (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, - int __base) __THROW +extern __inline long long int +__NTH (wcstoq (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __base)) { return __wcstoll_internal (__nptr, __endptr, __base, 0); } __extension__ -extern __inline unsigned long long int wcstouq (__const wchar_t * - __restrict __nptr, - wchar_t **__restrict __endptr, - int __base) __THROW +extern __inline unsigned long long int +__NTH (wcstouq (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __base)) { return __wcstoull_internal (__nptr, __endptr, __base, 0); } # endif /* Use GNU. */ #endif /* Optimizing GCC >=2. */ |