diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 19:21:56 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 19:21:56 +0200 |
| commit | 525c181a5a9a95e24d2111b7792608151a40eb84 (patch) | |
| tree | 8ba16eeb3fb7327e5c3c5bba9c5786d4bb6ccec1 /nptl/nptl-init.c | |
| parent | 4dd9e35bfd35d3138bc44169baba098005bad51e (diff) | |
| parent | 7bb5f8a836b916d6ebf7b6921b136e99cea2442d (diff) | |
Merge commit 'refs/top-bases/t/bigmem' into t/bigmem
Diffstat (limited to 'nptl/nptl-init.c')
| -rw-r--r-- | nptl/nptl-init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index c043fb50ab..bdbdfedcef 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2015 Free Software Foundation, Inc. +/* Copyright (C) 2002-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -127,7 +127,7 @@ static const struct pthread_functions pthread_functions = .ptr_pthread_mutex_lock = __pthread_mutex_lock, .ptr_pthread_mutex_unlock = __pthread_mutex_unlock, .ptr_pthread_self = __pthread_self, - .ptr_pthread_setcancelstate = __pthread_setcancelstate, + .ptr___pthread_setcancelstate = __pthread_setcancelstate, .ptr_pthread_setcanceltype = __pthread_setcanceltype, .ptr___pthread_cleanup_upto = __pthread_cleanup_upto, .ptr___pthread_once = __pthread_once, |