[cutter-commit 04501] clear-code/cutter@2dfec45 [master] Undef g_private_get/set before we define our them

[Kouhei S. <nul...@cl...>]

Kouhei Sutou	2014-02-08 17:56:29 +0900 (Sat, 08 Feb 2014)

  New Revision: 2dfec4556b6487f54a1274009dbeb34dc61fde4f
  https://github.com/clear-code/cutter/commit/2dfec4556b6487f54a1274009dbeb34dc61fde4f

  Message:
    Undef g_private_get/set before we define our them

  Modified files:
    cutter/cut-glib-compatible.h

  Modified: cutter/cut-glib-compatible.h (+2 -0)
===================================================================
--- cutter/cut-glib-compatible.h    2014-02-08 17:51:09 +0900 (9617fdb)
+++ cutter/cut-glib-compatible.h    2014-02-08 17:56:29 +0900 (ef233b7)
@@ -27,6 +27,8 @@ G_BEGIN_DECLS
 #if !GLIB_CHECK_VERSION(2, 32, 0)
 #  define GPrivate                  GStaticPrivate
 #  define G_PRIVATE_INIT(notify)    G_STATIC_PRIVATE_INIT
+#  undef g_private_get
+#  undef g_private_set
 #  define g_private_get(key)        g_static_private_get(key)
 #  define g_private_set(key, value) g_static_private_set(key, value, NULL)
 #else