diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-11-04 15:45:27 +0100 |
|---|---|---|
| committer |   Simon Rozman <simon@rozman.si> | 2020-11-04 16:46:24 +0100 |
| commit | c26b16e06f1e6e43427056e8107927a6fd94dd2b (patch) | |
| tree | a3da1cd233ba4e846e2acd3ff47be81841047f96 | |
| parent | api: upgrade nci.lib and wintun-inf.h building (diff) | |
| download | wintun-c26b16e06f1e6e43427056e8107927a6fd94dd2b.tar.xz wintun-c26b16e06f1e6e43427056e8107927a6fd94dd2b.zip | |
api: CALLBACK_FUNC -> CALLBACK
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | api/adapter.c | 2 | ||||
| -rw-r--r-- | api/logger.c | 4 | ||||
| -rw-r--r-- | api/logger.h | 4 | ||||
| -rw-r--r-- | api/wintun.h | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/api/adapter.c b/api/adapter.c index 50d1929..cf041f6 100644 --- a/api/adapter.c +++ b/api/adapter.c @@ -1840,7 +1840,7 @@ cleanupToken: } _Return_type_success_(return != FALSE) BOOL WINAPI - WintunEnumAdapters(_In_z_ const WCHAR *Pool, _In_ WINTUN_ENUM_CALLBACK_FUNC Func, _In_ LPARAM Param) + WintunEnumAdapters(_In_z_ const WCHAR *Pool, _In_ WINTUN_ENUM_CALLBACK Func, _In_ LPARAM Param) { HANDLE Mutex = NamespaceTakePoolMutex(Pool); if (!Mutex) diff --git a/api/logger.c b/api/logger.c index d86b7a8..2813db7 100644 --- a/api/logger.c +++ b/api/logger.c @@ -15,10 +15,10 @@ NopLogger(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ const WCHAR *LogLine) return TRUE; } -WINTUN_LOGGER_CALLBACK_FUNC Logger = NopLogger; +WINTUN_LOGGER_CALLBACK Logger = NopLogger; void CALLBACK -WintunSetLogger(_In_ WINTUN_LOGGER_CALLBACK_FUNC NewLogger) +WintunSetLogger(_In_ WINTUN_LOGGER_CALLBACK NewLogger) { if (!NewLogger) NewLogger = NopLogger; diff --git a/api/logger.h b/api/logger.h index 189ff72..7991996 100644 --- a/api/logger.h +++ b/api/logger.h @@ -9,13 +9,13 @@ #include "entry.h" #include <Windows.h> -extern WINTUN_LOGGER_CALLBACK_FUNC Logger; +extern WINTUN_LOGGER_CALLBACK Logger; /** * @copydoc WINTUN_SET_LOGGER_FUNC */ void WINAPI -WintunSetLogger(_In_ WINTUN_LOGGER_CALLBACK_FUNC NewLogger); +WintunSetLogger(_In_ WINTUN_LOGGER_CALLBACK NewLogger); _Post_equals_last_error_ DWORD LoggerLog(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ const WCHAR *Function, _In_z_ const WCHAR *LogLine); diff --git a/api/wintun.h b/api/wintun.h index fc38327..51d2de1 100644 --- a/api/wintun.h +++ b/api/wintun.h @@ -89,7 +89,7 @@ typedef _Return_type_success_(return != FALSE) * * @return Non-zero to continue iterating adapters; zero to stop. */ -typedef BOOL(CALLBACK *WINTUN_ENUM_CALLBACK_FUNC)(_In_ WINTUN_ADAPTER_HANDLE Adapter, _In_ LPARAM Param); +typedef BOOL(CALLBACK *WINTUN_ENUM_CALLBACK)(_In_ WINTUN_ADAPTER_HANDLE Adapter, _In_ LPARAM Param); /** * Enumerates all Wintun adapters. @@ -106,7 +106,7 @@ typedef BOOL(CALLBACK *WINTUN_ENUM_CALLBACK_FUNC)(_In_ WINTUN_ADAPTER_HANDLE Ada */ typedef _Return_type_success_(return != FALSE) BOOL(WINAPI *WINTUN_ENUM_ADAPTERS_FUNC)( _In_z_ const WCHAR *Pool, - _In_ WINTUN_ENUM_CALLBACK_FUNC Callback, + _In_ WINTUN_ENUM_CALLBACK Callback, _In_ LPARAM Param); /** @@ -205,7 +205,7 @@ typedef enum _WINTUN_LOGGER_LEVEL * * @return Anything - return value is ignored. */ -typedef BOOL(CALLBACK *WINTUN_LOGGER_CALLBACK_FUNC)(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ const WCHAR *Message); +typedef BOOL(CALLBACK *WINTUN_LOGGER_CALLBACK)(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ const WCHAR *Message); /** * Sets logger callback function. @@ -214,7 +214,7 @@ typedef BOOL(CALLBACK *WINTUN_LOGGER_CALLBACK_FUNC)(_In_ WINTUN_LOGGER_LEVEL Lev * threads concurrently. Should the logging require serialization, you must handle serialization in * NewLogger. Set to NULL to disable. */ -typedef void(WINAPI *WINTUN_SET_LOGGER_FUNC)(_In_ WINTUN_LOGGER_CALLBACK_FUNC NewLogger); +typedef void(WINAPI *WINTUN_SET_LOGGER_FUNC)(_In_ WINTUN_LOGGER_CALLBACK NewLogger); /** * Minimum ring capacity. |