From e24530d03bf2c7300736dd2a2829aca42fe94220 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 9 May 2016 13:14:01 +0800 Subject: [PATCH] gdk/win32/gdkmonitor-win32.c: Fix build on non-GCC WINBOOL is MinGW-specific, so change it to BOOL, which is universally available. Also, Visua Studio is more picky on where __stdcall (WINAPI) is placed, so fix that to be in-sync with what is done in the other sources. --- gdk/win32/gdkmonitor-win32.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gdk/win32/gdkmonitor-win32.c b/gdk/win32/gdkmonitor-win32.c index bae9320272..b78309841d 100644 --- a/gdk/win32/gdkmonitor-win32.c +++ b/gdk/win32/gdkmonitor-win32.c @@ -89,7 +89,7 @@ typedef struct fixedDISPLAYCONFIG_PATH_TARGET_INFO { DISPLAYCONFIG_SCALING scaling; DISPLAYCONFIG_RATIONAL refreshRate; DISPLAYCONFIG_SCANLINE_ORDERING scanLineOrdering; - WINBOOL targetAvailable; + BOOL targetAvailable; UINT32 statusFlags; } fixedDISPLAYCONFIG_PATH_TARGET_INFO; @@ -122,21 +122,21 @@ typedef struct fixedDISPLAYCONFIG_TARGET_DEVICE_NAME * to load them manually anyway (otherwise GTK apps won't even start * on Vista). */ -typedef LONG WINAPI -(* funcGetDisplayConfigBufferSizes) (UINT32 flags, - UINT32* numPathArrayElements, - UINT32* numModeInfoArrayElements); +typedef LONG +(WINAPI *funcGetDisplayConfigBufferSizes) (UINT32 flags, + UINT32* numPathArrayElements, + UINT32* numModeInfoArrayElements); -typedef LONG WINAPI -(* funcQueryDisplayConfig) (UINT32 flags, - UINT32* numPathArrayElements, - fixedDISPLAYCONFIG_PATH_INFO* pathArray, - UINT32* numModeInfoArrayElements, - DISPLAYCONFIG_MODE_INFO* modeInfoArray, - DISPLAYCONFIG_TOPOLOGY_ID* currentTopologyId); +typedef LONG +(WINAPI *funcQueryDisplayConfig) (UINT32 flags, + UINT32* numPathArrayElements, + fixedDISPLAYCONFIG_PATH_INFO* pathArray, + UINT32* numModeInfoArrayElements, + DISPLAYCONFIG_MODE_INFO* modeInfoArray, + DISPLAYCONFIG_TOPOLOGY_ID* currentTopologyId); -typedef LONG WINAPI -(* funcDisplayConfigGetDeviceInfo) (DISPLAYCONFIG_DEVICE_INFO_HEADER* requestPacket); +typedef LONG +(WINAPI *funcDisplayConfigGetDeviceInfo) (DISPLAYCONFIG_DEVICE_INFO_HEADER* requestPacket); #ifndef MONITORINFOF_PRIMARY #define MONITORINFOF_PRIMARY 1