mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-26 07:26:15 +01:00
Merge branch 'gconstructor-h-fix' into 'main'
gconstructor.h: Visual Studio: Only include gslist.h if needed Closes libadwaita#418 See merge request GNOME/glib!2487
This commit is contained in:
commit
40aeefc9ee
@ -55,7 +55,15 @@
|
||||
#elif defined (_MSC_VER) && (_MSC_VER >= 1500)
|
||||
/* 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"
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#define G_HAS_CONSTRUCTORS 1
|
||||
|
Loading…
Reference in New Issue
Block a user