aboutsummaryrefslogtreecommitdiff
path: root/loader/vk_loader_platform.h
diff options
context:
space:
mode:
authorCody Northrop <cody@lunarg.com>2015-07-08 16:48:37 -0600
committerCody Northrop <cody@lunarg.com>2015-07-08 16:55:52 -0600
commit927eeb45cddd60fb53bd65fb09d74ae2602a89b9 (patch)
tree648548d0322a3a9c4539fe1e496b0334f9c2346a /loader/vk_loader_platform.h
parent290095a6cd2efc6e719e77baeb57af96b8a94218 (diff)
downloadusermoji-927eeb45cddd60fb53bd65fb09d74ae2602a89b9.tar.xz
loader: Build fixes for Windows
Diffstat (limited to 'loader/vk_loader_platform.h')
-rw-r--r--loader/vk_loader_platform.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h
index 427cfea3..f7d3896d 100644
--- a/loader/vk_loader_platform.h
+++ b/loader/vk_loader_platform.h
@@ -31,6 +31,8 @@
#ifndef LOADER_PLATFORM_H
#define LOADER_PLATFORM_H
+#include "vk_platform.h"
+
#if defined(__linux__)
/* Linux-specific common code: */
@@ -172,6 +174,7 @@ static inline void *loader_aligned_alloc(size_t alignment, size_t size) { return
#include <stdio.h>
#include <io.h>
#include <stdbool.h>
+#include <shlwapi.h>
#ifdef __cplusplus
#include <iostream>
#include <string>
@@ -210,7 +213,7 @@ static bool loader_platform_file_exists(const char *path)
return true;
}
-static bool loader_is_path_absolute(const char *path)
+static bool loader_platform_is_path_absolute(const char *path)
{
return !PathIsRelative(path);
}
@@ -415,7 +418,7 @@ char *loader_get_registry_string(const HKEY hive,
#define DeleteCriticalSection PLEASE USE THE loader_platform_thread_delete_mutex() FUNCTION
#define loader_stack_alloc(size) _alloca(size)
-static inline void *loader_aligned_alloc(size_t alignment, size_t size) { return _aligned_alloc(alignment, size); }
+static inline void *loader_aligned_alloc(size_t alignment, size_t size) { return _aligned_malloc(alignment, size); }
#endif // defined(_WIN32)
#endif /* LOADER_PLATFORM_H_TEMP */