Can't compile wine-git: initializer element is not constant in d3d11

[Józef Kucia]

Thanks for finding this issue. The attached diff should fix
compilation for you. What compiler do you use?

On Sat, Aug 29, 2015 at 3:18 AM, Bruno Jesus <00cpxxx at gmail.com> wrote:
> Hi all, I have not compiled wine in one about 4 days and now I updated
> and tried and the results are:
>
> ../../../wine/dlls/d3d11/utils.c: In function
> ‘d3d11_resource_misc_flags_from_d3d10_resource_misc_flags’:
> ../../../wine/dlls/d3d11/utils.c:473:13: error: initializer element is
> not constant
> ../../../wine/dlls/d3d11/utils.c: In function
> ‘d3d10_resource_misc_flags_from_d3d11_resource_misc_flags’:
> ../../../wine/dlls/d3d11/utils.c:501:13: error: initializer element is
> not constant
> make[1]: ** [utils.o] Erro 1
> make[1]: Saindo do diretório `/home/bruno/programs/wine32/dlls/d3d11'
> make: ** [dlls/d3d11] Erro 2
>
> Is anyone experiencing a similar issue? I already tried make clean && make.
>
> Best regards,
> Bruno
>
>
-------------- next part --------------
diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c
index 307ef23..9899000 100644
--- a/dlls/d3d11/utils.c
+++ b/dlls/d3d11/utils.c
@@ -468,7 +468,7 @@ UINT d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(UINT resource_misc
     static const UINT bitwise_identical_flags = D3D10_RESOURCE_MISC_GENERATE_MIPS
             | D3D10_RESOURCE_MISC_SHARED
             | D3D10_RESOURCE_MISC_TEXTURECUBE;
-    static const UINT handled_flags = bitwise_identical_flags
+    UINT handled_flags = bitwise_identical_flags
             | D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX
             | D3D10_RESOURCE_MISC_GDI_COMPATIBLE;
     UINT d3d11_resource_misc_flags = resource_misc_flags & bitwise_identical_flags;
@@ -496,7 +496,7 @@ UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc
             | D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE
             | D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE_DRIVER
             | D3D11_RESOURCE_MISC_GUARDED;
-    static const UINT handled_flags = bitwise_identical_flags
+    UINT handled_flags = bitwise_identical_flags
             | D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX
             | D3D11_RESOURCE_MISC_GDI_COMPATIBLE;
     UINT d3d10_resource_misc_flags = resource_misc_flags & bitwise_identical_flags;