diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2009-02-18 15:49:44 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2009-02-18 15:49:44 +0000 |
| commit | cf22c5c9b3a4a6cc81a269d49d2324b5df084d74 (patch) | |
| tree | ca7e374c348baf4e6510329f3f271eca4eb5419f /include | |
| parent | 73c5dd45bc405428148ee740cac61a1279fe57d4 (diff) | |
Updated to fedora-glibc-20090218T1534
Diffstat (limited to 'include')
| -rw-r--r-- | include/atomic.h | 18 | ||||
| -rw-r--r-- | include/malloc.h | 13 | ||||
| -rw-r--r-- | include/rpc/auth.h | 2 |
3 files changed, 19 insertions, 14 deletions
diff --git a/include/atomic.h b/include/atomic.h index 2ad8b5fcb7..7c0548b004 100644 --- a/include/atomic.h +++ b/include/atomic.h @@ -1,5 +1,5 @@ /* Internal macros for atomic operations for GNU C Library. - Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -415,6 +415,22 @@ } while (0) #endif +#ifndef catomic_and +# define catomic_and(mem, mask) \ + do { \ + __typeof (*(mem)) __atg20_old; \ + __typeof (mem) __atg20_memp = (mem); \ + __typeof (*(mem)) __atg20_mask = (mask); \ + \ + do \ + __atg20_old = (*__atg20_memp); \ + while (__builtin_expect \ + (catomic_compare_and_exchange_bool_acq (__atg20_memp, \ + __atg20_old & __atg20_mask,\ + __atg20_old), 0)); \ + } while (0) +#endif + /* Atomically *mem &= mask and return the old value of *mem. */ #ifndef atomic_and_val # define atomic_and_val(mem, mask) \ diff --git a/include/malloc.h b/include/malloc.h index 1a20248559..42fc8ed696 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -8,20 +8,7 @@ /* Nonzero if the malloc is already initialized. */ extern int __malloc_initialized attribute_hidden; -/* Internal routines, operating on "arenas". */ struct malloc_state; typedef struct malloc_state *mstate; -extern __malloc_ptr_t _int_malloc (mstate __m, size_t __size) attribute_hidden; -extern void _int_free (mstate __m, __malloc_ptr_t __ptr) - attribute_hidden; -extern __malloc_ptr_t _int_realloc (mstate __m, - __malloc_ptr_t __ptr, - size_t __size) attribute_hidden; -extern __malloc_ptr_t _int_memalign (mstate __m, size_t __alignment, - size_t __size) - attribute_hidden; -extern __malloc_ptr_t _int_valloc (mstate __m, size_t __size) - attribute_hidden; - #endif diff --git a/include/rpc/auth.h b/include/rpc/auth.h index bc433b5930..a03188ed44 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -39,4 +39,6 @@ extern AUTH *authdes_pk_create_internal (const char *, netobj *, u_int, libc_hidden_proto (key_encryptsession_pk) libc_hidden_proto (key_decryptsession_pk) +libc_hidden_proto (_null_auth) + #endif |