[cogl/cogl-latest-win: 6/27] cogl-fixed.h: Disable G_CAN_INLINE on Visual Studio
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-latest-win: 6/27] cogl-fixed.h: Disable G_CAN_INLINE on Visual Studio
- Date: Mon, 18 Oct 2021 10:53:46 +0000 (UTC)
commit 9b74e245caa1b0ec1b74e5b7f549e6a80a03e4ff
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Oct 18 18:25:52 2021 +0800
cogl-fixed.h: Disable G_CAN_INLINE on Visual Studio
Otherwise we get symbol conflicts, and the code path when G_CAN_INLINE
does not work on Visual Studio
cogl/deprecated/cogl-fixed.h | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/cogl/deprecated/cogl-fixed.h b/cogl/deprecated/cogl-fixed.h
index 106c5138..aeb0528a 100644
--- a/cogl/deprecated/cogl-fixed.h
+++ b/cogl/deprecated/cogl-fixed.h
@@ -37,6 +37,10 @@
#include <cogl/cogl-types.h>
+#if defined (_MSC_VER) && !defined (__clang__)
+#undef G_CAN_INLINE
+#endif
+
/**
* SECTION:cogl-fixed
* @short_description: Fixed Point API
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]