From 8dcf20298f13785afa7eba32bb0ca32497302dc6 Mon Sep 17 00:00:00 2001
From: Frank Henigman <fjhenigman@chromium.org>
Date: Tue, 6 Dec 2016 16:35:12 -0500
Subject: [PATCH] GLSL: Always define TShader::~Includer().

Rather than update the existing ifdef to cover all necessary cases,
get rid of it and always define TShader::~Includer().
---
 glslang/Public/ShaderLang.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h
index 851e115e..323a4d75 100644
--- a/glslang/Public/ShaderLang.h
+++ b/glslang/Public/ShaderLang.h
@@ -375,9 +375,7 @@ public:
         // Signals that the parser will no longer use the contents of the
         // specified IncludeResult.
         virtual void releaseInclude(IncludeResult* result) = 0;
-#ifdef __ANDROID__
-        virtual ~Includer() {} // Pacify -Werror=non-virtual-dtor
-#endif
+        virtual ~Includer() {}
     };
 
     // Returns an error message for any #include directive.