From 9b505984f238bf6680773e1c4be5ba848dc10d30 Mon Sep 17 00:00:00 2001 From: Danila Malyutin Date: Mon, 7 Mar 2016 04:09:42 +0300 Subject: [PATCH 1/2] Fix for #1546 --- Utilities/GNU.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/GNU.h b/Utilities/GNU.h index 6bf8c7c886..268318e568 100644 --- a/Utilities/GNU.h +++ b/Utilities/GNU.h @@ -23,7 +23,7 @@ #if defined(_MSC_VER) #define force_inline __forceinline #else -#define force_inline __attribute__((always_inline)) +#define force_inline __attribute__((always_inline)) inline #endif #if defined(_MSC_VER) && _MSC_VER <= 1800 From d0ea8d5262b66563014f496c76d5bfd96f25961c Mon Sep 17 00:00:00 2001 From: Danila Malyutin Date: Mon, 7 Mar 2016 04:23:00 +0300 Subject: [PATCH 2/2] Update gslnag submodule. Fixes #1550 --- Vulkan/glslang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vulkan/glslang b/Vulkan/glslang index 6c292d3ba7..3c5b1e6b31 160000 --- a/Vulkan/glslang +++ b/Vulkan/glslang @@ -1 +1 @@ -Subproject commit 6c292d3ba78533fed7b5ec46bb93b53419cf6535 +Subproject commit 3c5b1e6b31aca0eb52fe7e82a963ff735f1de31b