From: Alexandre Julliard julliard@winehq.org
This avoids having to change the code when importing into Wine. --- include/private/{ => wine}/rbtree.h | 0 libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/preproc.h | 2 +- libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d/vkd3d_private.h | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename include/private/{ => wine}/rbtree.h (100%)
diff --git a/include/private/rbtree.h b/include/private/wine/rbtree.h similarity index 100% rename from include/private/rbtree.h rename to include/private/wine/rbtree.h diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 794749aa..26fa9c92 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -21,7 +21,7 @@ #define __VKD3D_SHADER_HLSL_H
#include "vkd3d_shader_private.h" -#include "rbtree.h" +#include "wine/rbtree.h" #include "vkd3d_d3dcommon.h" #include "vkd3d_d3dx9shader.h" #include "sm4.h" diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index e1cb75e1..4860cf5f 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -22,7 +22,7 @@ #define __VKD3D_SHADER_PREPROC_H
#include "vkd3d_shader_private.h" -#include "rbtree.h" +#include "wine/rbtree.h"
struct preproc_if_state { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 04dd133f..7c46cda1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -18,7 +18,7 @@ */
#include "vkd3d_shader_private.h" -#include "rbtree.h" +#include "wine/rbtree.h"
#include <stdarg.h> #include <stdio.h> diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index ccffb5de..dbf38279 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -32,7 +32,7 @@ #include "vkd3d_memory.h" #include "vkd3d_utf8.h" #include "wine/list.h" -#include "rbtree.h" +#include "wine/rbtree.h"
#include "vkd3d.h" #include "vkd3d_shader.h"