use #defines instead of enum for GtkFundamentalType compat, to prevent

Sun Sep 29 13:11:13 2002  Manish Singh  <yosh@gimp.org>

        * gtk/gtktypeutils.h: use #defines instead of enum for
        GtkFundamentalType compat, to prevent 64-bit vs. 32-bit
        confusion (#90400)

diff --git a/ChangeLog b/ChangeLog
index a22fa3cf9370a5c141e197572d4f0cf703166064..22d1a211f5db94c48aff3d9be73e7c1767d66b09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Sep 29 13:11:13 2002  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtktypeutils.h: use #defines instead of enum for
+       GtkFundamentalType compat, to prevent 64-bit vs. 32-bit
+       confusion (#90400)
+
 2002-09-29  Tor Lillqvist  <tml@iki.fi>
 
        * configure.in: Instead of forcing -fnative-struct into CFLAGS

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a22fa3cf9370a5c141e197572d4f0cf703166064..22d1a211f5db94c48aff3d9be73e7c1767d66b09 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Sep 29 13:11:13 2002  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtktypeutils.h: use #defines instead of enum for
+       GtkFundamentalType compat, to prevent 64-bit vs. 32-bit
+       confusion (#90400)
+
 2002-09-29  Tor Lillqvist  <tml@iki.fi>
 
        * configure.in: Instead of forcing -fnative-struct into CFLAGS

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a22fa3cf9370a5c141e197572d4f0cf703166064..22d1a211f5db94c48aff3d9be73e7c1767d66b09 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sun Sep 29 13:11:13 2002  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtktypeutils.h: use #defines instead of enum for
+       GtkFundamentalType compat, to prevent 64-bit vs. 32-bit
+       confusion (#90400)
+
 2002-09-29  Tor Lillqvist  <tml@iki.fi>
 
        * configure.in: Instead of forcing -fnative-struct into CFLAGS

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a22fa3cf9370a5c141e197572d4f0cf703166064..22d1a211f5db94c48aff3d9be73e7c1767d66b09 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Sep 29 13:11:13 2002  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtktypeutils.h: use #defines instead of enum for
+       GtkFundamentalType compat, to prevent 64-bit vs. 32-bit
+       confusion (#90400)
+
 2002-09-29  Tor Lillqvist  <tml@iki.fi>
 
        * configure.in: Instead of forcing -fnative-struct into CFLAGS

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a22fa3cf9370a5c141e197572d4f0cf703166064..22d1a211f5db94c48aff3d9be73e7c1767d66b09 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Sep 29 13:11:13 2002  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtktypeutils.h: use #defines instead of enum for
+       GtkFundamentalType compat, to prevent 64-bit vs. 32-bit
+       confusion (#90400)
+
 2002-09-29  Tor Lillqvist  <tml@iki.fi>
 
        * configure.in: Instead of forcing -fnative-struct into CFLAGS

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a22fa3cf9370a5c141e197572d4f0cf703166064..22d1a211f5db94c48aff3d9be73e7c1767d66b09 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Sep 29 13:11:13 2002  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtktypeutils.h: use #defines instead of enum for
+       GtkFundamentalType compat, to prevent 64-bit vs. 32-bit
+       confusion (#90400)
+
 2002-09-29  Tor Lillqvist  <tml@iki.fi>
 
        * configure.in: Instead of forcing -fnative-struct into CFLAGS

diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 2200af8afabc3bba7ba54a5c8cc3b08e44053eaa..532e8c1b8ccea605aa1b666a22fc078e41f5e7f9 100644 (file)
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -39,27 +39,27 @@ G_BEGIN_DECLS
  * many of these are just aliases for GLib types to maintain
  * compatibility
  */
-typedef enum   /*< skip >*/
-{
-  GTK_TYPE_INVALID     = G_TYPE_INVALID,
-  GTK_TYPE_NONE                = G_TYPE_NONE,
-  GTK_TYPE_ENUM                = G_TYPE_ENUM,
-  GTK_TYPE_FLAGS       = G_TYPE_FLAGS,
-
-  /* GtkArg types */
-  GTK_TYPE_CHAR                = G_TYPE_CHAR,
-  GTK_TYPE_UCHAR       = G_TYPE_UCHAR,
-  GTK_TYPE_BOOL                = G_TYPE_BOOLEAN,
-  GTK_TYPE_INT         = G_TYPE_INT,
-  GTK_TYPE_UINT                = G_TYPE_UINT,
-  GTK_TYPE_LONG                = G_TYPE_LONG,
-  GTK_TYPE_ULONG       = G_TYPE_ULONG,
-  GTK_TYPE_FLOAT       = G_TYPE_FLOAT,
-  GTK_TYPE_DOUBLE      = G_TYPE_DOUBLE,
-  GTK_TYPE_STRING      = G_TYPE_STRING,
-  GTK_TYPE_BOXED       = G_TYPE_BOXED,
-  GTK_TYPE_POINTER     = G_TYPE_POINTER
-} GtkFundamentalType;
+
+#define GTK_TYPE_INVALID G_TYPE_INVALID
+#define GTK_TYPE_NONE    G_TYPE_NONE
+#define GTK_TYPE_ENUM    G_TYPE_ENUM
+#define GTK_TYPE_FLAGS   G_TYPE_FLAGS
+
+/* GtkArg types */
+#define GTK_TYPE_CHAR    G_TYPE_CHAR
+#define GTK_TYPE_UCHAR   G_TYPE_UCHAR
+#define GTK_TYPE_BOOL    G_TYPE_BOOLEAN
+#define GTK_TYPE_INT     G_TYPE_INT
+#define GTK_TYPE_UINT    G_TYPE_UINT
+#define GTK_TYPE_LONG    G_TYPE_LONG
+#define GTK_TYPE_ULONG   G_TYPE_ULONG
+#define GTK_TYPE_FLOAT   G_TYPE_FLOAT
+#define GTK_TYPE_DOUBLE  G_TYPE_DOUBLE
+#define GTK_TYPE_STRING  G_TYPE_STRING
+#define GTK_TYPE_BOXED   G_TYPE_BOXED
+#define GTK_TYPE_POINTER G_TYPE_POINTER
+
+typedef GType GtkFundamentalType;
 
 /* --- type macros --- */
 #define GTK_CLASS_NAME(class)          (g_type_name (G_TYPE_FROM_CLASS (class)))