diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2019-08-19 08:15:10 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2019-08-19 08:15:10 +0000 |
| commit | 6817f6bcdc9d8e23365c64777bf4e91e83397194 (patch) | |
| tree | da655aa2ca77c28f3d4aaaff972bf2f210631c57 /net/ceph13/files/patch-src_common_assert.cc | |
| parent | math/rumur: Update 2019.07.21 -> 2019.08.18 (diff) | |
net/ceph13: upgrade 13.2.1 -> 13.2.6
PR: 239958
Submitted by: Willem Jan Withagen <wjw@digiware.nl> (maintainer)
Relnotes: https://ceph.io/releases/v13-2-6-mimic-released/
Notes
Notes:
svn path=/head/; revision=509257
Diffstat (limited to 'net/ceph13/files/patch-src_common_assert.cc')
| -rw-r--r-- | net/ceph13/files/patch-src_common_assert.cc | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/net/ceph13/files/patch-src_common_assert.cc b/net/ceph13/files/patch-src_common_assert.cc new file mode 100644 index 000000000000..dd186280515c --- /dev/null +++ b/net/ceph13/files/patch-src_common_assert.cc @@ -0,0 +1,30 @@ +diff --git a/src/common/assert.cc b/src/common/assert.cc +index 45d44d12ea..4a9625925f 100644 +--- src/common/assert.cc ++++ src/common/assert.cc +@@ -12,6 +12,7 @@ + * + */ + ++#include "include/compat.h" + #include "common/debug.h" + + namespace ceph { +@@ -40,7 +41,7 @@ namespace ceph { + g_assert_line = line; + g_assert_func = func; + g_assert_thread = (unsigned long long)pthread_self(); +- pthread_getname_np(pthread_self(), g_assert_thread_name, ++ ceph_pthread_getname(pthread_self(), g_assert_thread_name, + sizeof(g_assert_thread_name)); + + ostringstream tss; +@@ -88,7 +89,7 @@ namespace ceph { + g_assert_line = line; + g_assert_func = func; + g_assert_thread = (unsigned long long)pthread_self(); +- pthread_getname_np(pthread_self(), g_assert_thread_name, ++ ceph_pthread_getname(pthread_self(), g_assert_thread_name, + sizeof(g_assert_thread_name)); + + class BufAppender { |