From e14e8050dce910fb8e0f47ff092895c3033b4d90 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 30 May 2022 12:22:34 +0900 Subject: [PATCH] [vulkan] Remove vkparse.hinc from vkparse.h Kind of silly having the vkparse_internal define when it was just bypassed anyway. --- libs/video/renderer/vulkan/vkparse.c | 3 +-- libs/video/renderer/vulkan/vkparse.h | 3 --- libs/video/renderer/vulkan/vulkan_vid_common.c | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c index 344820e54..1b93e0d80 100644 --- a/libs/video/renderer/vulkan/vkparse.c +++ b/libs/video/renderer/vulkan/vkparse.c @@ -47,9 +47,8 @@ #include "vid_vulkan.h" -#define vkparse_internal #include "vkparse.h" -#undef vkparse_internal +#include "libs/video/renderer/vulkan/vkparse.hinc" typedef struct parseres_s { const char *name; diff --git a/libs/video/renderer/vulkan/vkparse.h b/libs/video/renderer/vulkan/vkparse.h index 730094e3b..52ab2cf47 100644 --- a/libs/video/renderer/vulkan/vkparse.h +++ b/libs/video/renderer/vulkan/vkparse.h @@ -10,9 +10,6 @@ typedef struct parsectx_s { #include "QF/cexpr.h" #include "QF/plist.h" -#ifdef vkparse_internal -#include "libs/video/renderer/vulkan/vkparse.hinc" -#endif #define QFV_PROPERTIES "properties" diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c index fcd9919fc..7a6149d9e 100644 --- a/libs/video/renderer/vulkan/vulkan_vid_common.c +++ b/libs/video/renderer/vulkan/vulkan_vid_common.c @@ -63,7 +63,6 @@ #include "vid_vulkan.h" #include "vkparse.h" - #include "libs/video/renderer/vulkan/vkparse.hinc" static exprsym_t builtin_plist_syms[] = {