aboutsummaryrefslogtreecommitdiff
path: root/posix
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-09-17 16:38:54 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-09-17 16:38:54 -0700
commite5d19c08d12880edbdf8772c8fb1f747c71d866e (patch)
tree92bf00b39e906a7b60b259758a91b675085a1a62 /posix
parent61f893789862db1dfdf188f77cd215bab0814d2c (diff)
downloadglibc-e5d19c08d12880edbdf8772c8fb1f747c71d866e.zip
glibc-e5d19c08d12880edbdf8772c8fb1f747c71d866e.tar.gz
glibc-e5d19c08d12880edbdf8772c8fb1f747c71d866e.tar.bz2
Use __pthread_setcancelstate in libc.a
This patch references __pthread_setcancelstate instead of pthread_setcancelstate in libc.a. [BZ #18970] * misc/error.c (error): Replace pthread_setcancelstate with __pthread_setcancelstate. (error_at_line): Likewise. * posix/wordexp.c (parse_comm): Likewise. * stdlib/fmtmsg.c (fmtmsg): Likewise. * nptl/forward.c (pthread_setcancelstate): Renamed to ... (__pthread_setcancelstate): This. (pthread_setcancelstate): Add an alias. * nptl/nptl-init.c (pthread_functions): Replace ptr_pthread_setcancelstate with ptr___pthread_setcancelstate. * sysdeps/nptl/pthread-functions.h (pthread_functions): Likewise. * nptl/pthreadP.h (__pthread_setcancelstate): Mark it with hidden_proto. * nptl/pthread_setcancelstate.c (__pthread_setcancelstate): Mark it with hidden_def. * sysdeps/nptl/libc-lockP.h (__pthread_setcancelstate): New. (pthread_setcancelstate): Renamed to ... (__pthread_setcancelstate): This. * sysdeps/unix/sysv/linux/fatal-prepare.h (FATAL_PREPARE): Use __libc_ptf_call with __pthread_setcancelstate.
Diffstat (limited to 'posix')
-rw-r--r--posix/wordexp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/posix/wordexp.c b/posix/wordexp.c
index 49ab71d..a36d2f9 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -1186,7 +1186,7 @@ parse_comm (char **word, size_t *word_length, size_t *max_length,
// XXX Ideally we do want the thread being cancelable.
// XXX If demand is there we'll change it.
int state = PTHREAD_CANCEL_ENABLE;
- __libc_ptf_call (pthread_setcancelstate,
+ __libc_ptf_call (__pthread_setcancelstate,
(PTHREAD_CANCEL_DISABLE, &state), 0);
#endif
@@ -1194,7 +1194,8 @@ parse_comm (char **word, size_t *word_length, size_t *max_length,
flags, pwordexp, ifs, ifs_white);
#ifdef __libc_ptf_call
- __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
+ __libc_ptf_call (__pthread_setcancelstate,
+ (state, NULL), 0);
#endif
free (comm);