Merge mysql.com:/usr/local/bk/mysql-5.0

into mysql.com:/usr/home/pem/mysql-5.0

Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/usr/home/pem/mysql-5.0
54560d50 · pem@mysql.com · 2865184e · a80d0e5d · 54560d50
Commit 54560d50 authored Sep 13, 2005 by pem@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

ndb/src/ndbapi/SignalSender.cpp ndb/src/ndbapi/SignalSender.cpp +3 -0

No files found.
--- a/ndb/src/ndbapi/SignalSender.cpp
+++ b/ndb/src/ndbapi/SignalSender.cpp
@@ -272,6 +272,9 @@ SignalSender::execNodeStatus(void* signalSender,
  NdbCondition_Signal(ss->m_cond);
 }

+#if __SUNPRO_CC != 0x560
 template SimpleSignal* SignalSender::waitFor<WaitForNode>(unsigned, WaitForNode&);
 template SimpleSignal* SignalSender::waitFor<WaitForAny>(unsigned, WaitForAny&);
+#endif
 template class Vector<SimpleSignal*>;
+