From 4161ca9b07967310a3873140959f8403358a3c0c Mon Sep 17 00:00:00 2001
From: scribam <scribam@users.noreply.github.com>
Date: Tue, 28 Jan 2020 18:23:29 +0100
Subject: [PATCH] msvc build fixes

---
 core/hw/sh4/modules/serial.cpp      |  2 +-
 core/rend/vulkan/vmallocator.cpp    | 10 ++--------
 core/rend/vulkan/vulkan_context.cpp |  5 +----
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/core/hw/sh4/modules/serial.cpp b/core/hw/sh4/modules/serial.cpp
index 9dc2d27fb..958696c2e 100644
--- a/core/hw/sh4/modules/serial.cpp
+++ b/core/hw/sh4/modules/serial.cpp
@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #else
-#include <windows.h>
+#include <io.h>
 #endif
 #include "types.h"
 #include "hw/sh4/sh4_mmr.h"
diff --git a/core/rend/vulkan/vmallocator.cpp b/core/rend/vulkan/vmallocator.cpp
index a21dbd58a..007c8f978 100644
--- a/core/rend/vulkan/vmallocator.cpp
+++ b/core/rend/vulkan/vmallocator.cpp
@@ -23,10 +23,7 @@
 #include "vmallocator.h"
 #include "vulkan_context.h"
 
-#if HOST_CPU == CPU_ARM
-__attribute__((pcs("aapcs-vfp")))
-#endif
-static void vmaAllocateDeviceMemoryCallback(
+VKAPI_ATTR static void VKAPI_CALL vmaAllocateDeviceMemoryCallback(
     VmaAllocator      allocator,
     uint32_t          memoryType,
     VkDeviceMemory    memory,
@@ -35,10 +32,7 @@ static void vmaAllocateDeviceMemoryCallback(
 	DEBUG_LOG(RENDERER, "VMAAllocator: %llu bytes allocated (type %d)", (unsigned long long)size, memoryType);
 }
 
-#if HOST_CPU == CPU_ARM
-__attribute__((pcs("aapcs-vfp")))
-#endif
-static void vmaFreeDeviceMemoryCallback(
+VKAPI_ATTR static void VKAPI_CALL vmaFreeDeviceMemoryCallback(
     VmaAllocator      allocator,
     uint32_t          memoryType,
     VkDeviceMemory    memory,
diff --git a/core/rend/vulkan/vulkan_context.cpp b/core/rend/vulkan/vulkan_context.cpp
index 943f1605a..fda54f582 100644
--- a/core/rend/vulkan/vulkan_context.cpp
+++ b/core/rend/vulkan/vulkan_context.cpp
@@ -35,11 +35,8 @@ VulkanContext *VulkanContext::contextInstance;
 
 static const char *PipelineCacheFileName = DATA_PATH "vulkan_pipeline.cache";
 
-#if HOST_CPU == CPU_ARM
-__attribute__((pcs("aapcs-vfp")))
-#endif
 #ifndef __ANDROID__
-static VkBool32 debugUtilsMessengerCallback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageTypes,
+VKAPI_ATTR static VkBool32 VKAPI_CALL debugUtilsMessengerCallback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageTypes,
 									 VkDebugUtilsMessengerCallbackDataEXT const * pCallbackData, void * /*pUserData*/)
 {
 	std::string msg = vk::to_string(static_cast<vk::DebugUtilsMessageSeverityFlagBitsEXT>(messageSeverity)) + ": "