From c9cf52652af2b7f6eefc2d2d23435814fb3e388a Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Fri, 28 Aug 2015 14:58:46 -0700 Subject: [PATCH] loader: Fix Windows build for alloc stuff --- loader/debug_report.c | 1 + loader/dirent_on_windows.c | 3 ++- loader/loader.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/loader/debug_report.c b/loader/debug_report.c index 3342a19..c7c1d9a 100644 --- a/loader/debug_report.c +++ b/loader/debug_report.c @@ -35,6 +35,7 @@ #include #else #endif +#include "vk_loader_platform.h" #include "debug_report.h" #include "vk_layer.h" diff --git a/loader/dirent_on_windows.c b/loader/dirent_on_windows.c index 5efec82..f873c12 100644 --- a/loader/dirent_on_windows.c +++ b/loader/dirent_on_windows.c @@ -7,13 +7,14 @@ Rights: See end of file. */ - #include #include #include /* _findfirst and _findnext set errno iff they return -1 */ #include #include +#include "vk_loader_platform.h" #include "loader.h" + #ifdef __cplusplus extern "C" { diff --git a/loader/loader.c b/loader/loader.c index 13e3d02..daf428a 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1659,7 +1659,7 @@ static void loader_get_manifest_files(const struct loader_instance *inst, } strcpy(loc, location); #if defined (_WIN32) - loc = loader_get_registry_files(loc); + loc = loader_get_registry_files(inst, loc); if (loc == NULL) { loader_log(VK_DBG_REPORT_ERROR_BIT, 0, "Registry lookup failed can't get manifest files"); return; -- 2.7.4