Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Fix MSVC warning due to Pango bug

Browse Source 
Pango unconditionally defines STRICT, which we use, see
https://learn.microsoft.com/en-us/windows/win32/winprog/enabling-strict

And that causes a duplicate definition, so we undefined it before
including the offending Pango header.

See also https://gitlab.gnome.org/GNOME/pango/-/merge_requests/749
This commit is contained in:
Benjamin Otte
2024-10-21 07:21:03 +02:00
parent 9a59fce106
commit a74457697e
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/win32/gdkwin32misc.c
View File

@@ -27,6 +27,7 @@
#include "gdkprivate-win32.h" #include "gdkprivate-win32.h"
#include "gdkdisplay-win32.h" #include "gdkdisplay-win32.h"
#undef STRICT
#include <pango/pangowin32.h> #include <pango/pangowin32.h>
struct _GdkWin32ALPNSink struct _GdkWin32ALPNSink

1
gsk/gskrendernodeparser.c
View File

@@ -56,6 +56,7 @@
#include <pango/pangofc-fontmap.h> #include <pango/pangofc-fontmap.h>
#endif #endif
#ifdef HAVE_PANGOWIN32 #ifdef HAVE_PANGOWIN32
#undef STRICT
#include <pango/pangowin32.h> #include <pango/pangowin32.h>
#endif #endif

1
gtk/gtkimcontextime.c
View File

@@ -40,6 +40,7 @@
#include "gtk/deprecated/gtkstylecontextprivate.h" #include "gtk/deprecated/gtkstylecontextprivate.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#undef STRICT
#include <pango/pangowin32.h> #include <pango/pangowin32.h>
/* Determines what happens when focus is lost while preedit is in process. */ /* Determines what happens when focus is lost while preedit is in process. */