reintroduce typedef gulong GType; for C++, to avoid C++ specific ABI

Fri Jun 22 11:31:27 2007  Tim Janik  <timj@gtk.org>

        * gtype.h: reintroduce typedef gulong GType; for C++, to avoid
        C++ specific ABI breakage.

svn path=/trunk/; revision=5582

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 5cd2e50..8e3db7d 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 22 11:31:27 2007  Tim Janik  <timj@gtk.org>
+
+       * gtype.h: reintroduce typedef gulong GType; for C++, to avoid
+       C++ specific ABI breakage.
+
 2007-06-18  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.13.5 ===

diff --git a/gobject/gtype.h b/gobject/gtype.h
index 0d9d677..10ca7ee 100644 (file)
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -88,7 +88,11 @@ G_BEGIN_DECLS
 
 /* Typedefs
  */
+#if     GLIB_SIZEOF_SIZE_T != GLIB_SIZEOF_LONG || !defined __cplusplus
 typedef gsize                           GType;
+#else   /* for historic reasons, C++ links against gulong GTypes */
+typedef gulong                          GType;
+#endif
 typedef struct _GValue                  GValue;
 typedef union  _GTypeCValue             GTypeCValue;
 typedef struct _GTypePlugin             GTypePlugin;