From e682329eeb5189b8b7bca95ab100fffc502e8335 Mon Sep 17 00:00:00 2001
From: Martin Haimberger <martin.haimberger@thincast.com>
Date: Wed, 15 Jul 2015 03:17:38 -0700
Subject: [PATCH] fixed compiler errors

---
 channels/audin/client/winmm/audin_winmm.c         | 2 +-
 channels/printer/client/printer_cups.c            | 2 +-
 channels/rdpsnd/client/opensles/rdpsnd_opensles.c | 2 +-
 channels/serial/client/serial_main.c              | 2 ++
 include/freerdp/freerdp.h                         | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/channels/audin/client/winmm/audin_winmm.c b/channels/audin/client/winmm/audin_winmm.c
index 3e5f13b23..3bef7e474 100644
--- a/channels/audin/client/winmm/audin_winmm.c
+++ b/channels/audin/client/winmm/audin_winmm.c
@@ -334,7 +334,7 @@ WIN32ERROR freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POIN
 	AudinWinmmDevice* winmm;
 	WIN32ERROR error;
 
-	winmm = (AudinWinmmDevice*) calloc(sizeof(AudinWinmmDevice));
+	winmm = (AudinWinmmDevice*) calloc(1, sizeof(AudinWinmmDevice));
 	if (!winmm)
 	{
 		WLog_ERR(TAG, "calloc failed!");
diff --git a/channels/printer/client/printer_cups.c b/channels/printer/client/printer_cups.c
index cd40aeb70..a80cecc32 100644
--- a/channels/printer/client/printer_cups.c
+++ b/channels/printer/client/printer_cups.c
@@ -263,7 +263,7 @@ static rdpPrinter** printer_cups_enum_printers(rdpPrinterDriver* driver)
 	int i;
 
 	num_dests = cupsGetDests(&dests);
-	printers = (rdpPrinter**) calloc(sizeof(rdpPrinter*) * (num_dests + 1));
+	printers = (rdpPrinter**) calloc(1, sizeof(rdpPrinter*) * (num_dests + 1));
 	if (!printers)
 		return NULL;
 
diff --git a/channels/rdpsnd/client/opensles/rdpsnd_opensles.c b/channels/rdpsnd/client/opensles/rdpsnd_opensles.c
index 4fd790b59..208b3d6a5 100644
--- a/channels/rdpsnd/client/opensles/rdpsnd_opensles.c
+++ b/channels/rdpsnd/client/opensles/rdpsnd_opensles.c
@@ -105,7 +105,7 @@ static bool rdpsnd_opensles_check_handle(const rdpsndopenslesPlugin *hdl)
 	return rc;
 }
 
-static void rdpsnd_opensles_set_volume(rdpsndDevicePlugin* device,
+static BOOL rdpsnd_opensles_set_volume(rdpsndDevicePlugin* device,
 		UINT32 volume);
 
 static int rdpsnd_opensles_set_params(rdpsndopenslesPlugin* opensles)
diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c
index 52c0081e8..cbc6f5f9e 100644
--- a/channels/serial/client/serial_main.c
+++ b/channels/serial/client/serial_main.c
@@ -932,9 +932,11 @@ WIN32ERROR DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
 
 	return error;
 error_out:
+#ifdef __linux__ /* to be removed */
 	ListDictionary_Free(serial->IrpThreads);
 	MessageQueue_Free(serial->MainIrpQueue);
 	Stream_Free(serial->device.data, TRUE);
 	free(serial);
+#endif /* __linux __ */
 	return error;
 }
diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h
index 6bb0ff4b6..efc4d6605 100644
--- a/include/freerdp/freerdp.h
+++ b/include/freerdp/freerdp.h
@@ -49,6 +49,7 @@ typedef RDP_CLIENT_ENTRY_POINTS_V1 RDP_CLIENT_ENTRY_POINTS;
 #include <freerdp/extension.h>
 
 #include <winpr/stream.h>
+#include <winpr/win32error.h>
 
 #include <freerdp/input.h>
 #include <freerdp/update.h>