diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-01-17 10:42:43 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-01-17 10:42:43 +0000 |
| commit | af98d46f5a025ae33c60ddb1a5edc753fb714bc5 (patch) | |
| tree | 24a3c5cb0bfc6163b52ae74ac205f0e175beee87 /include | |
| parent | 1f09da09fed864c91288ff91295114fa5202edaa (diff) | |
Updated to fedora-glibc-20070117T0857
Diffstat (limited to 'include')
| -rw-r--r-- | include/atomic.h | 6 | ||||
| -rw-r--r-- | include/string.h | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/atomic.h b/include/atomic.h index ec1e9899f1..2ad8b5fcb7 100644 --- a/include/atomic.h +++ b/include/atomic.h @@ -497,6 +497,12 @@ #endif +#ifndef atomic_forced_read +# define atomic_forced_read(x) \ + ({ __typeof (x) __x; __asm ("" : "=r" (__x) : "0" (x)); __x; }) +#endif + + #ifndef atomic_delay # define atomic_delay() do { /* nothing */ } while (0) #endif diff --git a/include/string.h b/include/string.h index c196007dcb..f73bbf9f43 100644 --- a/include/string.h +++ b/include/string.h @@ -54,8 +54,9 @@ extern __typeof (strcasecmp_l) __strcasecmp_l; extern __typeof (strncasecmp_l) __strncasecmp_l; /* Alternative version which doesn't pollute glibc's namespace. */ -#undef strndupa -#define strndupa(s, n) \ +#ifndef NOT_IN_libc +# undef strndupa +# define strndupa(s, n) \ (__extension__ \ ({ \ __const char *__old = (s); \ @@ -64,6 +65,7 @@ extern __typeof (strncasecmp_l) __strncasecmp_l; __new[__len] = '\0'; \ (char *) memcpy (__new, __old, __len); \ })) +#endif libc_hidden_proto (__mempcpy) libc_hidden_proto (__stpcpy) |