summaryrefslogtreecommitdiff
path: root/pthread/pt-setcanceltype.c
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2012-08-30 23:31:39 +0200
committerThomas Schwinge <thomas@codesourcery.com>2012-08-30 23:31:39 +0200
commit16a92d2765c5732abb64742cb5d387148e0ac629 (patch)
treeabbbadbf54f87eed25f71a312e43ce7f7cb7adfe /pthread/pt-setcanceltype.c
parent9a231435f830c459c0e214c2b99877e2ed6edb56 (diff)
parent0096579c8bea920f7c42b40ea22db621da6480a5 (diff)
Merge commit 'refs/top-bases/t/fix_inline' into t/fix_inlinet/fix_inline
Conflicts: sysdeps/l4/hurd/pt-sysdep.h
Diffstat (limited to 'pthread/pt-setcanceltype.c')
-rw-r--r--pthread/pt-setcanceltype.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/pthread/pt-setcanceltype.c b/pthread/pt-setcanceltype.c
index 3ce4259..7226a3a 100644
--- a/pthread/pt-setcanceltype.c
+++ b/pthread/pt-setcanceltype.c
@@ -22,7 +22,7 @@
#include <pt-internal.h>
int
-pthread_setcanceltype (int type, int *oldtype)
+__pthread_setcanceltype (int type, int *oldtype)
{
struct __pthread *p = _pthread_self ();
@@ -41,3 +41,5 @@ pthread_setcanceltype (int type, int *oldtype)
return 0;
}
+
+strong_alias (__pthread_setcanceltype, pthread_setcanceltype);