aboutsummaryrefslogtreecommitdiff
path: root/loader
diff options
context:
space:
mode:
authorJon Ashburn <jon@lunarg.com>2015-08-28 14:58:46 -0700
committerJon Ashburn <jon@lunarg.com>2015-09-04 15:46:31 -0600
commitc9cf52652af2b7f6eefc2d2d23435814fb3e388a (patch)
treeedc9c5efd779090ee753be69ba832ff9bbaf1d93 /loader
parentd42181fd35f4964c14c9fb87506aa07c7f263765 (diff)
downloadusermoji-c9cf52652af2b7f6eefc2d2d23435814fb3e388a.tar.xz
loader: Fix Windows build for alloc stuff
Diffstat (limited to 'loader')
-rw-r--r--loader/debug_report.c1
-rw-r--r--loader/dirent_on_windows.c3
-rw-r--r--loader/loader.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/loader/debug_report.c b/loader/debug_report.c
index 3342a195..c7c1d9a2 100644
--- a/loader/debug_report.c
+++ b/loader/debug_report.c
@@ -35,6 +35,7 @@
#include <signal.h>
#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 5efec829..f873c129 100644
--- a/loader/dirent_on_windows.c
+++ b/loader/dirent_on_windows.c
@@ -7,13 +7,14 @@
Rights: See end of file.
*/
-
#include <dirent_on_windows.h>
#include <errno.h>
#include <io.h> /* _findfirst and _findnext set errno iff they return -1 */
#include <stdlib.h>
#include <string.h>
+#include "vk_loader_platform.h"
#include "loader.h"
+
#ifdef __cplusplus
extern "C"
{
diff --git a/loader/loader.c b/loader/loader.c
index 13e3d022..daf428ac 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;