diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2012-08-30 23:48:39 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-08-30 23:48:39 +0200 |
commit | a8b134d8c667b0105d7194a78f3fe478a3857302 (patch) | |
tree | 94da06519d2a623ce4e7aee21fd7b32ffecfea59 /pthread/pt-setcanceltype.c | |
parent | 013f554871c671f88942c9429720d3bb9a76c5ea (diff) | |
parent | 0096579c8bea920f7c42b40ea22db621da6480a5 (diff) |
Merge commit 'refs/top-bases/t/stand-alone' into t/stand-alonet/stand-alone
Conflicts:
Makefile.am
Diffstat (limited to 'pthread/pt-setcanceltype.c')
-rw-r--r-- | pthread/pt-setcanceltype.c | 4 |
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); |