From 8b853a62c5c9d6b58e0b81b082555c172f867345 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 3 Aug 1998 14:06:18 +0000 Subject: [PATCH] change order of gpointer data; field in struct _GNode to be partly binary Mon Aug 3 16:02:26 1998 Tim Janik * glib.h: * gnode.c: change order of gpointer data; field in struct _GNode to be partly binary compatible with GList and GSList. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib.h | 5 ++--- glib/glib.h | 5 ++--- glib/gnode.c | 4 ++-- gnode.c | 4 ++-- 12 files changed, 56 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index b393a66..2b55fc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Aug 3 16:02:26 1998 Tim Janik + + * glib.h: + * gnode.c: change order of gpointer data; field in struct _GNode to + be partly binary compatible with GList and GSList. + 1998-08-03 Sebastian Wilhelmi * garray.c (g_ptr_array_remove_index): bugfix: index check for diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b393a66..2b55fc2 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Aug 3 16:02:26 1998 Tim Janik + + * glib.h: + * gnode.c: change order of gpointer data; field in struct _GNode to + be partly binary compatible with GList and GSList. + 1998-08-03 Sebastian Wilhelmi * garray.c (g_ptr_array_remove_index): bugfix: index check for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b393a66..2b55fc2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Aug 3 16:02:26 1998 Tim Janik + + * glib.h: + * gnode.c: change order of gpointer data; field in struct _GNode to + be partly binary compatible with GList and GSList. + 1998-08-03 Sebastian Wilhelmi * garray.c (g_ptr_array_remove_index): bugfix: index check for diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index b393a66..2b55fc2 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Mon Aug 3 16:02:26 1998 Tim Janik + + * glib.h: + * gnode.c: change order of gpointer data; field in struct _GNode to + be partly binary compatible with GList and GSList. + 1998-08-03 Sebastian Wilhelmi * garray.c (g_ptr_array_remove_index): bugfix: index check for diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b393a66..2b55fc2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Aug 3 16:02:26 1998 Tim Janik + + * glib.h: + * gnode.c: change order of gpointer data; field in struct _GNode to + be partly binary compatible with GList and GSList. + 1998-08-03 Sebastian Wilhelmi * garray.c (g_ptr_array_remove_index): bugfix: index check for diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b393a66..2b55fc2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Aug 3 16:02:26 1998 Tim Janik + + * glib.h: + * gnode.c: change order of gpointer data; field in struct _GNode to + be partly binary compatible with GList and GSList. + 1998-08-03 Sebastian Wilhelmi * garray.c (g_ptr_array_remove_index): bugfix: index check for diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b393a66..2b55fc2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Aug 3 16:02:26 1998 Tim Janik + + * glib.h: + * gnode.c: change order of gpointer data; field in struct _GNode to + be partly binary compatible with GList and GSList. + 1998-08-03 Sebastian Wilhelmi * garray.c (g_ptr_array_remove_index): bugfix: index check for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b393a66..2b55fc2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Aug 3 16:02:26 1998 Tim Janik + + * glib.h: + * gnode.c: change order of gpointer data; field in struct _GNode to + be partly binary compatible with GList and GSList. + 1998-08-03 Sebastian Wilhelmi * garray.c (g_ptr_array_remove_index): bugfix: index check for diff --git a/glib.h b/glib.h index b48ed11..e05c5f5 100644 --- a/glib.h +++ b/glib.h @@ -748,12 +748,11 @@ gint g_tree_nnodes (GTree *tree); */ struct _GNode { - GNode *prev; + gpointer data; GNode *next; + GNode *prev; GNode *parent; GNode *children; - - gpointer data; }; #define G_NODE_IS_ROOT(node) (((GNode*) (node))->parent == NULL && \ diff --git a/glib/glib.h b/glib/glib.h index b48ed11..e05c5f5 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -748,12 +748,11 @@ gint g_tree_nnodes (GTree *tree); */ struct _GNode { - GNode *prev; + gpointer data; GNode *next; + GNode *prev; GNode *parent; GNode *children; - - gpointer data; }; #define G_NODE_IS_ROOT(node) (((GNode*) (node))->parent == NULL && \ diff --git a/glib/gnode.c b/glib/gnode.c index 2279de2..a70b204 100644 --- a/glib/gnode.c +++ b/glib/gnode.c @@ -49,11 +49,11 @@ g_node_new (gpointer data) else node = g_chunk_new (GNode, g_tree_node_chunk); - node->prev = NULL; + node->data = data; node->next = NULL; + node->prev = NULL; node->parent = NULL; node->children = NULL; - node->data = data; return node; } diff --git a/gnode.c b/gnode.c index 2279de2..a70b204 100644 --- a/gnode.c +++ b/gnode.c @@ -49,11 +49,11 @@ g_node_new (gpointer data) else node = g_chunk_new (GNode, g_tree_node_chunk); - node->prev = NULL; + node->data = data; node->next = NULL; + node->prev = NULL; node->parent = NULL; node->children = NULL; - node->data = data; return node; } -- 2.7.4