 @@ -1,7 +1,17 @@
-$NetBSD: distinfo,v 1.3 2009/06/05 09:49:53 hasso Exp $
+$NetBSD: distinfo,v 1.4 2011/11/22 20:07:20 joerg Exp $
 SHA1 (synergy-1.2.7.tar.gz) = 5964460892fd9e9cb55c5bfe4e781f2bc08d0b76
 RMD160 (synergy-1.2.7.tar.gz) = 6bdbe5adbc13c2f49afcb99ccaa20b96a12c2bcf
 Size (synergy-1.2.7.tar.gz) = 707319 bytes
-SHA1 (patch-aa) = 20747abe2f447adb5967a767ee5ec9d9f09c8fb4
+SHA1 (patch-aa) = 5a48140c7622195a716eededae2d1ee0f6fa4e85
-SHA1 (patch-ab) = 2a4b8c368f0733f0c6e9d60b42660e459a2a55c1
+SHA1 (patch-ab) = 011deedba1d2a793ff4add4196c8a10708e864f5
 SHA1 (patch-lib-arch-CArchDaemonUnix.cpp) = 1d11d87f9a388ba68403ff74d4fcd5fa180a919e
 SHA1 (patch-lib_arch_CMultibyte.cpp) = 66cc7cd1e327a1bfd519cb003835914221cbb369
 SHA1 (patch-lib_base_CStringUtil.cpp) = 8f803bcab5a37bd4bf5a918fe3333338bd7d22c2
 SHA1 (patch-lib_client_CClient.cpp) = afa4dc5089da155756a5ea4772be216256f71663
 SHA1 (patch-lib_client_CServerProxy.cpp) = d6692bebbb6c71684cd320822859701b96fb7efc
 SHA1 (patch-lib_net_CTCPSocket.cpp) = 609768fa601c76e6431c222ab66e7aabf59bab49
 SHA1 (patch-lib_server_CServer.cpp) = eefe1004a9dd7216c0496f9e9b46cfa0fa2f13f3
 SHA1 (patch-lib_synergy_CPacketStreamFilter.cpp) = 614734a5a276950ff688e4d3a9c3e7ae66fed743
 SHA1 (patch-lib_synergy_IKeyState.cpp) = fb6a64639156f56bb353ed598835cb5badb3a1f2
 SHA1 (patch-lib_synergy_IPrimaryScreen.cpp) = 3a04d64a8270ed2da265213bacdf32c72ad01fcc

 @@ -1,31 +1,39 @@
-$NetBSD: patch-aa,v 1.1 2009/02/09 17:04:49 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2011/11/22 20:07:20 joerg Exp $
---- lib/platform/CXWindowsScreen.cpp.orig	2009-02-09 17:47:55.000000000 +0100
+--- lib/platform/CXWindowsScreen.cpp.orig	2005-12-15 05:46:20.000000000 +0000
 +++ lib/platform/CXWindowsScreen.cpp
-@@ -923,7 +923,7 @@ CXWindowsScreen::openIM()
+@@ -25,6 +25,7 @@
  #include "CStringUtil.h"
  #include "IEventQueue.h"
  #include "TMethodEventJob.h"
 +#include <cstdlib>
  #include <cstring>
  #if X_DISPLAY_MISSING
  #	error X11 is required to build synergy
@@ -923,7 +924,7 @@ CXWindowsScreen::openIM()
  	// find the appropriate style.  synergy supports XIMPreeditNothing
  	// only at the moment.
  	XIMStyles* styles;
 -	if (XGetIMValues(im, XNQueryInputStyle, &styles, NULL) != NULL ||
 +	if (XGetIMValues(im, XNQueryInputStyle, &styles, (void *)NULL) != NULL ||
  		styles == NULL) {
  		LOG((CLOG_WARN "cannot get IM styles"));
  		XCloseIM(im);
-@@ -946,7 +946,7 @@ CXWindowsScreen::openIM()
+@@ -946,7 +947,7 @@ CXWindowsScreen::openIM()
+ 	}
  	// create an input context for the style and tell it about our window
 -	XIC ic = XCreateIC(im, XNInputStyle, style, XNClientWindow, m_window, NULL);
 +	XIC ic = XCreateIC(im, XNInputStyle, style, XNClientWindow, m_window, (void *)NULL);
  	if (ic == NULL) {
  		LOG((CLOG_WARN "cannot create IC"));
  		XCloseIM(im);
-@@ -955,7 +955,7 @@ CXWindowsScreen::openIM()
+@@ -955,7 +956,7 @@ CXWindowsScreen::openIM()
  	// find out the events we must select for and do so
  	unsigned long mask;
 -	if (XGetICValues(ic, XNFilterEvents, &mask, NULL) != NULL) {
 +	if (XGetICValues(ic, XNFilterEvents, &mask, (void *)NULL) != NULL) {
  		LOG((CLOG_WARN "cannot get IC filter events"));
  		XDestroyIC(ic);
  		XCloseIM(im);

 @@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.1 2009/06/05 09:49:53 hasso Exp $
+$NetBSD: patch-ab,v 1.2 2011/11/22 20:07:20 joerg Exp $
---- lib/arch/CArchNetworkBSD.cpp.orig	2009-06-05 12:09:52 +0300
+--- lib/arch/CArchNetworkBSD.cpp.orig	2011-11-22 19:34:07.000000000 +0000
-+++ lib/arch/CArchNetworkBSD.cpp	2009-06-05 12:11:02 +0300
++++ lib/arch/CArchNetworkBSD.cpp
-@@ -50,6 +50,8 @@
+@@ -28,6 +28,7 @@
- #if HAVE_ALLOCA_H
+ #include <fcntl.h>
- #	define freea(x_)
+ #include <errno.h>
- #else
+ #include <string.h>
-+#	undef alloca
++#include <stdlib.h>
 +#	undef freea
- #	define alloca(x_) malloc(x_)
+ #if HAVE_POLL
- #	define freea(x_) free(x_)
+ #	include <poll.h>
  #endif

$NetBSD: patch-lib-arch-CArchDaemonUnix.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $ --- lib/arch/CArchDaemonUnix.cpp.orig 2005-01-01 20:52:42.000000000 +0000 +++ lib/arch/CArchDaemonUnix.cpp @@ -19,6 +19,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <errno.h> +#include <stdlib.h> // // CArchDaemonUnix

$NetBSD: patch-lib_arch_CMultibyte.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $ --- lib/arch/CMultibyte.cpp.orig 2011-11-22 19:34:33.000000000 +0000 +++ lib/arch/CMultibyte.cpp @@ -18,15 +18,13 @@ #include "common.h" #include "CArch.h" #include <limits.h> +#include <stdlib.h> #include <string.h> #if HAVE_LOCALE_H # include <locale.h> #endif #if HAVE_WCHAR_H || defined(_MSC_VER) # include <wchar.h> -#elif __APPLE__ - // wtf? Darwin puts mbtowc() et al. in stdlib -# include <stdlib.h> #else // platform apparently has no wchar_t support. provide dummy // implementations. hopefully at least the C++ compiler has

$NetBSD: patch-lib_base_CStringUtil.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $ --- lib/base/CStringUtil.cpp.orig 2011-11-22 19:35:22.000000000 +0000 +++ lib/base/CStringUtil.cpp @@ -20,6 +20,7 @@ #include <cstdio> #include <cstdlib> #include <algorithm> +#include <cstring> // // CStringUtil

$NetBSD: patch-lib_client_CClient.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $ --- lib/client/CClient.cpp.orig 2011-11-22 19:38:57.000000000 +0000 +++ lib/client/CClient.cpp @@ -26,6 +26,8 @@ #include "CLog.h" #include "IEventQueue.h" #include "TMethodEventJob.h" +#include <stdlib.h> +#include <string.h> // // CClient

$NetBSD: patch-lib_client_CServerProxy.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $ --- lib/client/CServerProxy.cpp.orig 2011-11-22 19:39:17.000000000 +0000 +++ lib/client/CServerProxy.cpp @@ -24,6 +24,7 @@ #include "TMethodEventJob.h" #include "XBase.h" #include <memory> +#include <string.h> // // CServerProxy

$NetBSD: patch-lib_net_CTCPSocket.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $ --- lib/net/CTCPSocket.cpp.orig 2011-11-22 19:36:24.000000000 +0000 +++ lib/net/CTCPSocket.cpp @@ -23,6 +23,7 @@ #include "IEventJob.h" #include "CArch.h" #include "XArch.h" +#include <stdlib.h> #include <string.h> //

$NetBSD: patch-lib_server_CServer.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $ --- lib/server/CServer.cpp.orig 2011-11-22 19:39:54.000000000 +0000 +++ lib/server/CServer.cpp @@ -28,6 +28,7 @@ #include "CLog.h" #include "TMethodEventJob.h" #include "CArch.h" +#include <stdlib.h> #include <string.h> //

$NetBSD: patch-lib_synergy_CPacketStreamFilter.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $ --- lib/synergy/CPacketStreamFilter.cpp.orig 2011-11-22 19:37:00.000000000 +0000 +++ lib/synergy/CPacketStreamFilter.cpp @@ -16,6 +16,7 @@ #include "IEventQueue.h" #include "CLock.h" #include "TMethodEventJob.h" +#include <string.h> // // CPacketStreamFilter

$NetBSD: patch-lib_synergy_IKeyState.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $ --- lib/synergy/IKeyState.cpp.orig 2011-11-22 19:37:22.000000000 +0000 +++ lib/synergy/IKeyState.cpp @@ -13,6 +13,7 @@ */ #include "IKeyState.h" +#include <stdlib.h> // // IKeyState

$NetBSD: patch-lib_synergy_IPrimaryScreen.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $ --- lib/synergy/IPrimaryScreen.cpp.orig 2011-11-22 19:37:41.000000000 +0000 +++ lib/synergy/IPrimaryScreen.cpp @@ -13,6 +13,7 @@ */ #include "IPrimaryScreen.h" +#include <stdlib.h> // // IPrimaryScreen