From ea4efd7bba01d8dd3b92f9262d350529e50401d5 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Fri, 22 Jun 2007 09:34:33 +0000 Subject: [PATCH] reintroduce typedef gulong GType; for C++, to avoid C++ specific ABI Fri Jun 22 11:31:27 2007 Tim Janik * gtype.h: reintroduce typedef gulong GType; for C++, to avoid C++ specific ABI breakage. svn path=/trunk/; revision=5582 --- gobject/ChangeLog | 5 +++++ gobject/gtype.h | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 5cd2e50..8e3db7d 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,8 @@ +Fri Jun 22 11:31:27 2007 Tim Janik + + * gtype.h: reintroduce typedef gulong GType; for C++, to avoid + C++ specific ABI breakage. + 2007-06-18 Matthias Clasen * === Released 2.13.5 === diff --git a/gobject/gtype.h b/gobject/gtype.h index 0d9d677..10ca7ee 100644 --- 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; -- 2.7.4