Repository: kudu
Updated Branches:
  refs/heads/master 57fe0c3db -> 416b3018a


[util] fix build on OS X

This is a follow-up for c20b84bb600575e4f6a34846c07acf4603b1bf26.

Change-Id: Ia8905e412a036ef4ca9fbedc589d01a8d79eb0c7
Reviewed-on: http://gerrit.cloudera.org:8080/9433
Reviewed-by: Todd Lipcon <t...@apache.org>
Reviewed-by: Dan Burkert <danburk...@apache.org>
Tested-by: Alexey Serbin <aser...@cloudera.com>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/416b3018
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/416b3018
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/416b3018

Branch: refs/heads/master
Commit: 416b3018a415e9a6515e5a7ffb0f3f51c0482757
Parents: 57fe0c3
Author: Alexey Serbin <aser...@cloudera.com>
Authored: Fri Feb 23 12:16:22 2018 -0800
Committer: Alexey Serbin <aser...@cloudera.com>
Committed: Fri Feb 23 21:10:06 2018 +0000

----------------------------------------------------------------------
 src/kudu/util/debug-util.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/416b3018/src/kudu/util/debug-util.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/debug-util.cc b/src/kudu/util/debug-util.cc
index 5a142bc..128cbdf 100644
--- a/src/kudu/util/debug-util.cc
+++ b/src/kudu/util/debug-util.cc
@@ -230,7 +230,7 @@ void HandleStackTraceSignal(int /*signum*/, siginfo_t* 
info, void* /*ucontext*/)
   SCOPED_CLEANUP({
       errno = save_errno;
     });
-  auto* sig_data = reinterpret_cast<SignalData*>(info->si_ptr);
+  auto* sig_data = reinterpret_cast<SignalData*>(info->si_value.sival_ptr);
   DCHECK(sig_data);
   if (!sig_data) {
     // Maybe the signal was sent by a user instead of by ourself, ignore it.
@@ -474,17 +474,17 @@ Status StackTraceCollector::AwaitCollection(MonoTime 
deadline) {
   return Status::OK();
 }
 
-#else  // __linux__
+#else  // #ifdef __linux__ ...
 Status StackTraceCollector::TriggerAsync(int64_t tid_, StackTrace* stack) {
   return Status::NotSupported("unsupported platform");
 }
-Status StackTraceCollector::AwaitCollection() {
+Status StackTraceCollector::AwaitCollection(MonoTime deadline) {
   return Status::NotSupported("unsupported platform");
 }
 bool StackTraceCollector::RevokeSigData() {
   return false;
 }
-#endif // __linux__
+#endif // #ifdef __linux__ ... #else ...
 
 Status GetThreadStack(int64_t tid, StackTrace* stack) {
   StackTraceCollector c;

Reply via email to