From 2b3b999929af71ad75bfe203e2f3d3cf7726e7cd Mon Sep 17 00:00:00 2001 From: Martin Haimberger Date: Wed, 3 Jun 2015 06:34:43 -0700 Subject: [PATCH] changed returnvalues of DeviceServiceEntry to WIN32ERROR --- channels/client/CMakeLists.txt | 2 +- channels/client/tables.c.in | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt index 2db18e8ee..14700be9d 100644 --- a/channels/client/CMakeLists.txt +++ b/channels/client/CMakeLists.txt @@ -39,7 +39,7 @@ foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES}) if(${${STATIC_MODULE}_CLIENT_ENTRY} STREQUAL "VirtualChannelEntry") set(ENTRY_POINT_IMPORT "extern BOOL VCAPITYPE ${ENTRY_POINT_NAME}(PCHANNEL_ENTRY_POINTS);") else() - set(ENTRY_POINT_IMPORT "extern void ${ENTRY_POINT_NAME}();") + set(ENTRY_POINT_IMPORT "extern WIN32ERROR ${ENTRY_POINT_NAME}();") endif() set(${STATIC_ENTRY}_IMPORTS "${${STATIC_ENTRY}_IMPORTS}\n${ENTRY_POINT_IMPORT}") set(${STATIC_ENTRY}_TABLE "${${STATIC_ENTRY}_TABLE}\n\t{ \"${STATIC_MODULE_CHANNEL}\", ${ENTRY_POINT_NAME} },") diff --git a/channels/client/tables.c.in b/channels/client/tables.c.in index b656dbb9b..919738a04 100644 --- a/channels/client/tables.c.in +++ b/channels/client/tables.c.in @@ -3,6 +3,8 @@ * Static Entry Point Tables * * Copyright 2012 Marc-Andre Moreau + * Copyright 2015 Thincast Technologies GmbH + * Copyright 2015 DI (FH) Martin Haimberger * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +20,7 @@ */ #include "tables.h" +#include ${CLIENT_STATIC_ENTRY_IMPORTS}