diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-09-14 11:05:01 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-09-14 11:05:01 +0200 |
| commit | a31519cef9edea573edeb58ddd85417380cc5712 (patch) | |
| tree | bb7c3944c0e74a70c2da747bed34502a74c59d3a /nptl | |
| parent | 85cf3748c6c1f8f7484a35aa17616390a621382a (diff) | |
| parent | 02bf610ca82f4b5660dadcfff04124e73f8ef2ff (diff) | |
| download | glibc-a31519cef9edea573edeb58ddd85417380cc5712.tar.gz glibc-a31519cef9edea573edeb58ddd85417380cc5712.tar.xz glibc-a31519cef9edea573edeb58ddd85417380cc5712.zip | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/bits/libc-lock.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index b537413ce6..e9a278214a 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2009-09-07 Andreas Schwab <schwab@redhat.com> + + * sysdeps/pthread/bits/libc-lock.h (BP_SYM): Remove space before paren. + 2009-09-02 Suzuki K P <suzuki@in.ibm.com> Joseph Myers <joseph@codesourcery.com> diff --git a/nptl/sysdeps/pthread/bits/libc-lock.h b/nptl/sysdeps/pthread/bits/libc-lock.h index a597f3b5a6..0cad8aa899 100644 --- a/nptl/sysdeps/pthread/bits/libc-lock.h +++ b/nptl/sysdeps/pthread/bits/libc-lock.h @@ -529,7 +529,7 @@ extern int __pthread_atfork (void (*__prepare) (void), # if _LIBC # include <bp-sym.h> # else -# define BP_SYM (sym) sym +# define BP_SYM(sym) sym # endif weak_extern (BP_SYM (__pthread_mutex_init)) weak_extern (BP_SYM (__pthread_mutex_destroy)) |