From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 2 Jun 2008 21:14:31 +0000
Subject: svn merge -r88066:88786
 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
---
 indra/llcommon/llheartbeat.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/llcommon/llheartbeat.cpp')

diff --git a/indra/llcommon/llheartbeat.cpp b/indra/llcommon/llheartbeat.cpp
index 782a4f7ff6..b08e72137a 100644
--- a/indra/llcommon/llheartbeat.cpp
+++ b/indra/llcommon/llheartbeat.cpp
@@ -72,8 +72,13 @@ LLHeartbeat::rawSend()
 	if (mSuppressed)
 		return 0; // Pretend we succeeded.
 
+	int result;
+#ifndef LL_DARWIN
 	union sigval dummy;
-	int result = sigqueue(getppid(), LL_HEARTBEAT_SIGNAL, dummy);
+	result = sigqueue(getppid(), LL_HEARTBEAT_SIGNAL, dummy);
+#else
+	result = kill(getppid(), LL_HEARTBEAT_SIGNAL);
+#endif
 	if (result == 0)
 		return 0; // success
 
-- 
cgit v1.2.3