From 55db438d63b4ddf31b9c06541b20ef29c59044ac Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Mon, 21 Jul 2014 09:43:37 -0400 Subject: [PATCH] Resolved ambiguous WINAPI issues on Windows. --- redo/comctl32_windows.c | 4 ++-- redo/winapi_windows.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/redo/comctl32_windows.c b/redo/comctl32_windows.c index ede4c0c..2fc978c 100644 --- a/redo/comctl32_windows.c +++ b/redo/comctl32_windows.c @@ -5,7 +5,7 @@ static ULONG_PTR comctlManifestCookie; static HMODULE comctl32; -/* TODO do any of these take WINAPI? */ +/* these are listed as WINAPI in both Microsoft's and MinGW's headers, but not on MSDN for some reason */ BOOL (*WINAPI fv_SetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); BOOL (*WINAPI fv_RemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); LRESULT (*WINAPI fv_DefSubclassProc)(HWND, UINT, WPARAM, LPARAM); @@ -16,7 +16,7 @@ DWORD initCommonControls(LPCWSTR manifest, char **errmsg) HANDLE ac; INITCOMMONCONTROLSEX icc; FARPROC f; - /* TODO does this take WINAPI? */ + /* this is listed as WINAPI in both Microsoft's and MinGW's headers, but not on MSDN for some reason */ BOOL (*WINAPI ficc)(const LPINITCOMMONCONTROLSEX); ZeroMemory(&actctx, sizeof (ACTCTX)); diff --git a/redo/winapi_windows.h b/redo/winapi_windows.h index 0a8c19e..6d7f548 100644 --- a/redo/winapi_windows.h +++ b/redo/winapi_windows.h @@ -32,7 +32,7 @@ extern DWORD makemsgwin(char **); /* comctl32_windows.c */ extern DWORD initCommonControls(LPCWSTR, char **); -/* TODO do any of these take WINAPI? */ +/* these are listed as WINAPI in both Microsoft's and MinGW's headers, but not on MSDN for some reason */ extern BOOL (*WINAPI fv_SetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); extern BOOL (*WINAPI fv_RemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); extern LRESULT (*WINAPI fv_DefSubclassProc)(HWND, UINT, WPARAM, LPARAM);