fixed compiler errors

This commit is contained in:
Martin Haimberger 2015-07-15 03:17:38 -07:00
parent 6ab0187d84
commit e682329eeb
5 changed files with 6 additions and 3 deletions

View File

@ -334,7 +334,7 @@ WIN32ERROR freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POIN
AudinWinmmDevice* winmm; AudinWinmmDevice* winmm;
WIN32ERROR error; WIN32ERROR error;
winmm = (AudinWinmmDevice*) calloc(sizeof(AudinWinmmDevice)); winmm = (AudinWinmmDevice*) calloc(1, sizeof(AudinWinmmDevice));
if (!winmm) if (!winmm)
{ {
WLog_ERR(TAG, "calloc failed!"); WLog_ERR(TAG, "calloc failed!");

View File

@ -263,7 +263,7 @@ static rdpPrinter** printer_cups_enum_printers(rdpPrinterDriver* driver)
int i; int i;
num_dests = cupsGetDests(&dests); num_dests = cupsGetDests(&dests);
printers = (rdpPrinter**) calloc(sizeof(rdpPrinter*) * (num_dests + 1)); printers = (rdpPrinter**) calloc(1, sizeof(rdpPrinter*) * (num_dests + 1));
if (!printers) if (!printers)
return NULL; return NULL;

View File

@ -105,7 +105,7 @@ static bool rdpsnd_opensles_check_handle(const rdpsndopenslesPlugin *hdl)
return rc; return rc;
} }
static void rdpsnd_opensles_set_volume(rdpsndDevicePlugin* device, static BOOL rdpsnd_opensles_set_volume(rdpsndDevicePlugin* device,
UINT32 volume); UINT32 volume);
static int rdpsnd_opensles_set_params(rdpsndopenslesPlugin* opensles) static int rdpsnd_opensles_set_params(rdpsndopenslesPlugin* opensles)

View File

@ -932,9 +932,11 @@ WIN32ERROR DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
return error; return error;
error_out: error_out:
#ifdef __linux__ /* to be removed */
ListDictionary_Free(serial->IrpThreads); ListDictionary_Free(serial->IrpThreads);
MessageQueue_Free(serial->MainIrpQueue); MessageQueue_Free(serial->MainIrpQueue);
Stream_Free(serial->device.data, TRUE); Stream_Free(serial->device.data, TRUE);
free(serial); free(serial);
#endif /* __linux __ */
return error; return error;
} }

View File

@ -49,6 +49,7 @@ typedef RDP_CLIENT_ENTRY_POINTS_V1 RDP_CLIENT_ENTRY_POINTS;
#include <freerdp/extension.h> #include <freerdp/extension.h>
#include <winpr/stream.h> #include <winpr/stream.h>
#include <winpr/win32error.h>
#include <freerdp/input.h> #include <freerdp/input.h>
#include <freerdp/update.h> #include <freerdp/update.h>