From: Benjamin Otte Date: Tue, 25 Apr 2023 21:18:36 +0000 (+0200) Subject: gdk: Add workaround for Visual Studio X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~366^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4333d754b87d1a99112363f4e157bb2682eda88f;p=gtk4.git gdk: Add workaround for Visual Studio apparently casting something to itself makes it not constant. --- diff --git a/gdk/gdkglversionprivate.h b/gdk/gdkglversionprivate.h index 3b1f8352df..a144b5679c 100644 --- a/gdk/gdkglversionprivate.h +++ b/gdk/gdkglversionprivate.h @@ -49,8 +49,7 @@ struct _GdkGLVersion int minor; }; -#define GDK_GL_VERSION_INIT(maj,min) (GdkGLVersion) { maj, min } -#define GDK_GL_VERSION_STRING(str) GDK_GL_VERSION_INIT(str[0] - '0', str[2] - '0') +#define GDK_GL_VERSION_INIT(maj,min) { maj, min } static const GdkGLVersion supported_gl_versions[] = { GDK_GL_VERSION_INIT (4, 6), @@ -77,6 +76,10 @@ static const GdkGLVersion supported_gles_versions[] = { GDK_GL_VERSION_INIT (0, 0) }; +#undef GDK_GL_VERSION_INIT +#define GDK_GL_VERSION_INIT(maj,min) (GdkGLVersion) { maj, min } +#define GDK_GL_VERSION_STRING(str) GDK_GL_VERSION_INIT(str[0] - '0', str[2] - '0') + static inline const GdkGLVersion * gdk_gl_versions_get_for_api (GdkGLAPI api) {