Import of pkgsrc-2015Q1

This commit is contained in:
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions

View File

@@ -0,0 +1,23 @@
$NetBSD: patch-src_lib_ipc_CIpcClientProxy.cpp,v 1.2 2015/02/03 18:49:34 tnn Exp $
g++ on sparc64 complains: ISO C++ says that these are ambiguous:
synergy/ProtocolUtil.h:82:16: note: candidate 1: static void ProtocolUtil::writef(void*, const char*, va_list)
static void writef(void*, const char* fmt, va_list);
^
synergy/ProtocolUtil.h:53:16: note: candidate 2: static void ProtocolUtil::writef(synergy::IStream*, const char*, ...)
static void writef(synergy::IStream*,
^
synergy/ProtocolUtil.h:82:16: error: 'static void ProtocolUtil::writef(void*, const char*, va_list)' is private
static void writef(void*, const char* fmt, va_list);
^
--- src/lib/ipc/IpcClientProxy.cpp.orig 2014-12-02 15:03:19.000000000 +0000
+++ src/lib/ipc/IpcClientProxy.cpp
@@ -147,7 +147,7 @@ IpcClientProxy::send(const IpcMessage& m
case kIpcLogLine: {
const IpcLogLineMessage& llm = static_cast<const IpcLogLineMessage&>(message);
String logLine = llm.logLine();
- ProtocolUtil::writef(&m_stream, kIpcMsgLogLine, &logLine);
+ ProtocolUtil::writef(&m_stream, kIpcMsgLogLine, "%s", &logLine);
break;
}