denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

windows: Use WINAPI call convention for Windows API callbacks

Browse Source 
For x86_64 it does not actually matter, but for i686 builds the call convention
is different with WINAPI.
This commit is contained in:
Martin Willi
2014-06-06 16:28:28 +02:00
parent bd19e27ae3
commit cab59c73fc
8 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon-svc/charon-svc.c
+6 -6
View File
@@ -48,8 +48,8 @@ extern void (*dbg) (debug_t group, level_t level, char *fmt, ...);
/**
* Forward declaration
*/
static DWORD service_handler(DWORD dwControl, DWORD dwEventType,
LPVOID lpEventData, LPVOID lpContext);
static DWORD WINAPI service_handler(DWORD dwControl, DWORD dwEventType,
LPVOID lpEventData, LPVOID lpContext);
/**
* Logging hook for library logs, using stderr output
@@ -111,7 +111,7 @@ static void update_status(DWORD state)
/**
* Control handler for console
*/
static BOOL console_handler(DWORD dwCtrlType)
static BOOL WINAPI console_handler(DWORD dwCtrlType)
{
switch (dwCtrlType)
{
@@ -135,8 +135,8 @@ static BOOL console_handler(DWORD dwCtrlType)
/**
* Service handler function
*/
static DWORD service_handler(DWORD dwControl, DWORD dwEventType,
LPVOID lpEventData, LPVOID lpContext)
static DWORD WINAPI service_handler(DWORD dwControl, DWORD dwEventType,
LPVOID lpEventData, LPVOID lpContext)
{
switch (dwControl)
{
@@ -285,7 +285,7 @@ static bool switch_workingdir()
/**
* Service main routine when running as service
*/
static void service_main(DWORD dwArgc, LPTSTR *lpszArgv)
static void WINAPI service_main(DWORD dwArgc, LPTSTR *lpszArgv)
{
memset(&status, 0, sizeof(status));
status.dwServiceType = SERVICE_WIN32_OWN_PROCESS;