diff options
| author | Halton Huo <halton.huo@intel.com> | 2014-02-21 18:05:29 +0800 |
|---|---|---|
| committer | Halton Huo <halton.huo@intel.com> | 2014-03-05 16:34:20 +0800 |
| commit | f0870c3bfeba99482392fafe6d5f49615393c2b1 (patch) | |
| tree | 1890250f9c08baa19ddd7b0a6fccaab1f95dc3d4 /libc/bionic/pthread_cond.cpp | |
| parent | bef5016491eed41521f514d5c5528e2274689948 (diff) | |
| download | bionic-f0870c3bfeba99482392fafe6d5f49615393c2b1.zip bionic-f0870c3bfeba99482392fafe6d5f49615393c2b1.tar.gz bionic-f0870c3bfeba99482392fafe6d5f49615393c2b1.tar.bz2 | |
Fix some pthread symbols build as C++ symbol under x64 lunch.
Functions protected with !defined(__LP64__) will be get build as C++
symbols for X64 build. This is not the desired work. So protect the
implementation with !defined(__LP64__) as well.
Change-Id: I4ef50ec36e46289ab308063e24f6c5ac61a6ca8d
Diffstat (limited to 'libc/bionic/pthread_cond.cpp')
| -rw-r--r-- | libc/bionic/pthread_cond.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/bionic/pthread_cond.cpp b/libc/bionic/pthread_cond.cpp index 213bcd7..c09e972 100644 --- a/libc/bionic/pthread_cond.cpp +++ b/libc/bionic/pthread_cond.cpp @@ -206,14 +206,14 @@ extern "C" int pthread_cond_timedwait_monotonic(pthread_cond_t* cond, pthread_mu extern "C" int pthread_cond_timedwait_monotonic_np(pthread_cond_t* cond, pthread_mutex_t* mutex, const timespec* abstime) { return __pthread_cond_timedwait(cond, mutex, abstime, CLOCK_MONOTONIC); } -#endif // !defined(__LP64__) -int pthread_cond_timedwait_relative_np(pthread_cond_t* cond, pthread_mutex_t* mutex, const timespec* reltime) { +extern "C" int pthread_cond_timedwait_relative_np(pthread_cond_t* cond, pthread_mutex_t* mutex, const timespec* reltime) { return __pthread_cond_timedwait_relative(cond, mutex, reltime); } -int pthread_cond_timeout_np(pthread_cond_t* cond, pthread_mutex_t* mutex, unsigned ms) { +extern "C" int pthread_cond_timeout_np(pthread_cond_t* cond, pthread_mutex_t* mutex, unsigned ms) { timespec ts; timespec_from_ms(ts, ms); return __pthread_cond_timedwait_relative(cond, mutex, &ts); } +#endif // !defined(__LP64__) |