luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

gconstructor.h: Visual Studio: Only include gslist.h if needed

Browse Source 
We only want to include gslist.h here if it was not already included via
including glib.h, as:

* gslist.h should normally be included via glib.h if used outside of
  GLib itself.
* This broke Visual Studio builds that use GResources (via
  glib-compile-resources.exe) as that would cause the generated code to
  include gslist.h directly, which is therefore disallowed.
This commit is contained in:
Chun-wei Fan 2022-02-14 18:26:13 +08:00
parent 6ee71750a5
commit 87db363501
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glib/gconstructor.h
View File

@ -55,7 +55,15 @@
#elif defined (_MSC_VER) && (_MSC_VER >= 1500) #elif defined (_MSC_VER) && (_MSC_VER >= 1500)
/* Visual studio 2008 and later has _Pragma */ /* Visual studio 2008 and later has _Pragma */
/*
* Only try to include gslist.h if not already included via glib.h,
* so that items using gconstructor.h outside of GLib (such as
* GResources) continue to build properly.
*/
#ifndef __G_LIB_H__
#include "gslist.h" #include "gslist.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#define G_HAS_CONSTRUCTORS 1 #define G_HAS_CONSTRUCTORS 1