From 9d5e4daf84c89901409aaec0a0c3be7af68ff6c0 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Mon, 17 Oct 2016 17:56:08 +0200 Subject: [PATCH] libs/vkd3d-utils: Get rid of unnecessary WINAPI. --- include/vkd3d.h | 4 ++-- include/vkd3d_utils.h | 8 ++++---- libs/vkd3d-utils/vkd3d_utils_main.c | 8 ++++---- libs/vkd3d/vkd3d_main.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 945fdf09..5e814217 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -30,7 +30,7 @@ extern "C" { #endif /* __cplusplus */ -typedef BOOL (WINAPI *vkd3d_signal_event_pfn)(HANDLE event); +typedef BOOL (*vkd3d_signal_event_pfn)(HANDLE event); struct vkd3d_device_create_info { @@ -38,7 +38,7 @@ struct vkd3d_device_create_info vkd3d_signal_event_pfn signal_event_pfn; }; -HRESULT WINAPI vkd3d_create_device(const struct vkd3d_device_create_info *create_info, +HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, REFIID riid, void **device); #ifdef __cplusplus diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index a1ea425c..d7112f26 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -34,10 +34,10 @@ extern "C" { #define WAIT_FAILED (~0u) #define INFINITE (~0u) -HANDLE WINAPI vkd3d_create_event(void); -BOOL WINAPI vkd3d_signal_event(HANDLE event); -unsigned int WINAPI vkd3d_wait_event(HANDLE event, unsigned int milliseconds); -void WINAPI vkd3d_destroy_event(HANDLE event); +HANDLE vkd3d_create_event(void); +BOOL vkd3d_signal_event(HANDLE event); +unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds); +void vkd3d_destroy_event(HANDLE event); #ifdef __cplusplus } diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 7c9bb75a..764c633d 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -47,7 +47,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, } /* Events */ -HANDLE WINAPI vkd3d_create_event(void) +HANDLE vkd3d_create_event(void) { struct vkd3d_event *event; int rc; @@ -78,7 +78,7 @@ HANDLE WINAPI vkd3d_create_event(void) return event; } -unsigned int WINAPI vkd3d_wait_event(HANDLE event, unsigned int milliseconds) +unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds) { struct vkd3d_event *impl = event; int rc; @@ -121,7 +121,7 @@ unsigned int WINAPI vkd3d_wait_event(HANDLE event, unsigned int milliseconds) return WAIT_FAILED; } -BOOL WINAPI vkd3d_signal_event(HANDLE event) +BOOL vkd3d_signal_event(HANDLE event) { struct vkd3d_event *impl = event; int rc; @@ -140,7 +140,7 @@ BOOL WINAPI vkd3d_signal_event(HANDLE event) return TRUE; } -void WINAPI vkd3d_destroy_event(HANDLE event) +void vkd3d_destroy_event(HANDLE event) { struct vkd3d_event *impl = event; int rc; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 68d213d8..2bd243bd 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -23,7 +23,7 @@ #define INITGUID #include "vkd3d_private.h" -HRESULT WINAPI vkd3d_create_device(const struct vkd3d_device_create_info *create_info, +HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, REFIID riid, void **device) { struct d3d12_device *object;