Attachment 154046 Details for Bug 198447 – Work around array problems in Blender's usage of _Generic

[patch] Work around array problems in Blender's usage of _Generic

graphics__blender-fix-generic-macros-1.diff (text/plain), 2.74 KB, created by Dimitry Andric on 2015-03-09 07:58:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2015-03-09 07:58:20 UTC

Size: 2.74 KB

patch

obsolete

>Index: graphics/blender/files/patch-source__blender__blenlib__BLI_compiler_typecheck.h
>===================================================================
>--- graphics/blender/files/patch-source__blender__blenlib__BLI_compiler_typecheck.h	(revision 0)
>+++ graphics/blender/files/patch-source__blender__blenlib__BLI_compiler_typecheck.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- source/blender/blenlib/BLI_compiler_typecheck.h.orig	2015-01-13 06:58:28.000000000 +0100
>++++ source/blender/blenlib/BLI_compiler_typecheck.h	2015-03-09 08:35:48.662916000 +0100
>+@@ -60,7 +60,7 @@
>+ #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
>+ #  define CHECK_TYPE_INLINE(val, type) \
>+ 	(void)((void)(((type)0) != (0 ? (val) : ((type)0))), \
>+-	       _Generic((val), type: 0, const type: 0))
>++	       _Generic((0, val), type: 0, const type: 0))
>+ #else
>+ #  define CHECK_TYPE_INLINE(val, type) \
>+ 	((void)(((type)0) != (0 ? (val) : ((type)0))))
>
>Property changes on: graphics/blender/files/patch-source__blender__blenlib__BLI_compiler_typecheck.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/blender/files/patch-source__blender__editors__include__BIF_gl.h
>===================================================================
>--- graphics/blender/files/patch-source__blender__editors__include__BIF_gl.h	(revision 0)
>+++ graphics/blender/files/patch-source__blender__editors__include__BIF_gl.h	(working copy)
>@@ -0,0 +1,19 @@
>+--- source/blender/editors/include/BIF_gl.h.orig	2015-01-21 13:31:24.000000000 +0100
>++++ source/blender/editors/include/BIF_gl.h	2015-03-09 08:44:01.942737000 +0100
>+@@ -54,14 +54,14 @@
>+ 
>+ #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
>+ #  define glMultMatrixf(x)  \
>+-	glMultMatrixf(_Generic((x), \
>++	glMultMatrixf(_Generic((0, x), \
>+ 	        float *:      (float *)(x), \
>+ 	        float (*)[4]: (float *)(x), \
>+ 	        const float *:      (float *)(x), \
>+ 	        const float (*)[4]: (float *)(x)) \
>+ )
>+ #  define glLoadMatrixf(x)  \
>+-	glLoadMatrixf(_Generic((x), \
>++	glLoadMatrixf(_Generic((0, x), \
>+ 	        float *:      (float *)(x), \
>+ 	        float (*)[4]: (float *)(x)) \
>+ )
>
>Property changes on: graphics/blender/files/patch-source__blender__editors__include__BIF_gl.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 198447: 154046