changed func_data to user_data for g_scanner_scope_symbol_foreach()

diff --git a/ChangeLog b/ChangeLog
index 976a94f..c9e057f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+       * glib.h, gscanner.c: changed func_data to user_data in
+        g_scanner_scope_symbol_foreach and associated friends, because
+       AIX headers #define func_data.
+
 1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Fixed stupid bug, that made

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 976a94f..c9e057f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+       * glib.h, gscanner.c: changed func_data to user_data in
+        g_scanner_scope_symbol_foreach and associated friends, because
+       AIX headers #define func_data.
+
 1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Fixed stupid bug, that made

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 976a94f..c9e057f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+       * glib.h, gscanner.c: changed func_data to user_data in
+        g_scanner_scope_symbol_foreach and associated friends, because
+       AIX headers #define func_data.
+
 1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Fixed stupid bug, that made

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 976a94f..c9e057f 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+       * glib.h, gscanner.c: changed func_data to user_data in
+        g_scanner_scope_symbol_foreach and associated friends, because
+       AIX headers #define func_data.
+
 1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Fixed stupid bug, that made

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 976a94f..c9e057f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+       * glib.h, gscanner.c: changed func_data to user_data in
+        g_scanner_scope_symbol_foreach and associated friends, because
+       AIX headers #define func_data.
+
 1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Fixed stupid bug, that made

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 976a94f..c9e057f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+       * glib.h, gscanner.c: changed func_data to user_data in
+        g_scanner_scope_symbol_foreach and associated friends, because
+       AIX headers #define func_data.
+
 1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Fixed stupid bug, that made

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 976a94f..c9e057f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+       * glib.h, gscanner.c: changed func_data to user_data in
+        g_scanner_scope_symbol_foreach and associated friends, because
+       AIX headers #define func_data.
+
 1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Fixed stupid bug, that made

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 976a94f..c9e057f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+       * glib.h, gscanner.c: changed func_data to user_data in
+        g_scanner_scope_symbol_foreach and associated friends, because
+       AIX headers #define func_data.
+
 1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Fixed stupid bug, that made

diff --git a/glib.h b/glib.h
index 24e5a6b..80eca01 100644 (file)
--- a/glib.h
+++ b/glib.h
@@ -1976,7 +1976,7 @@ gpointer  g_scanner_scope_lookup_symbol   (GScanner       *scanner,
 void           g_scanner_scope_foreach_symbol  (GScanner       *scanner,
                                                 guint           scope_id,
                                                 GHFunc          func,
-                                                gpointer        func_data);
+                                                gpointer        user_data);
 gpointer       g_scanner_lookup_symbol         (GScanner       *scanner,
                                                 const gchar    *symbol);
 void           g_scanner_freeze_symbol_table   (GScanner       *scanner);

diff --git a/glib/glib.h b/glib/glib.h
index 24e5a6b..80eca01 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -1976,7 +1976,7 @@ gpointer  g_scanner_scope_lookup_symbol   (GScanner       *scanner,
 void           g_scanner_scope_foreach_symbol  (GScanner       *scanner,
                                                 guint           scope_id,
                                                 GHFunc          func,
-                                                gpointer        func_data);
+                                                gpointer        user_data);
 gpointer       g_scanner_lookup_symbol         (GScanner       *scanner,
                                                 const gchar    *symbol);
 void           g_scanner_freeze_symbol_table   (GScanner       *scanner);

diff --git a/glib/gscanner.c b/glib/gscanner.c
index c6fd0dd..2576830 100644 (file)
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -522,31 +522,31 @@ g_scanner_foreach_internal (gpointer  _key,
   register GScannerKey *key;
   register gpointer *d;
   register GHFunc func;
-  register gpointer func_data;
+  register gpointer user_data;
   register guint *scope_id;
   
   d = _user_data;
   func = (GHFunc) d[0];
-  func_data = d[1];
+  user_data = d[1];
   scope_id = d[2];
   key = _value;
   
   if (key->scope_id == *scope_id)
-    func (key->symbol, key->value, func_data);
+    func (key->symbol, key->value, user_data);
 }
 
 void
 g_scanner_scope_foreach_symbol (GScanner       *scanner,
                                guint           scope_id,
                                GHFunc          func,
-                               gpointer        func_data)
+                               gpointer        user_data)
 {
   gpointer d[3];
   
   g_return_if_fail (scanner != NULL);
   
   d[0] = (gpointer) func;
-  d[1] = func_data;
+  d[1] = user_data;
   d[2] = &scope_id;
   
   g_hash_table_foreach (scanner->symbol_table, g_scanner_foreach_internal, d);

diff --git a/gscanner.c b/gscanner.c
index c6fd0dd..2576830 100644 (file)
--- a/gscanner.c
+++ b/gscanner.c
@@ -522,31 +522,31 @@ g_scanner_foreach_internal (gpointer  _key,
   register GScannerKey *key;
   register gpointer *d;
   register GHFunc func;
-  register gpointer func_data;
+  register gpointer user_data;
   register guint *scope_id;
   
   d = _user_data;
   func = (GHFunc) d[0];
-  func_data = d[1];
+  user_data = d[1];
   scope_id = d[2];
   key = _value;
   
   if (key->scope_id == *scope_id)
-    func (key->symbol, key->value, func_data);
+    func (key->symbol, key->value, user_data);
 }
 
 void
 g_scanner_scope_foreach_symbol (GScanner       *scanner,
                                guint           scope_id,
                                GHFunc          func,
-                               gpointer        func_data)
+                               gpointer        user_data)
 {
   gpointer d[3];
   
   g_return_if_fail (scanner != NULL);
   
   d[0] = (gpointer) func;
-  d[1] = func_data;
+  d[1] = user_data;
   d[2] = &scope_id;
   
   g_hash_table_foreach (scanner->symbol_table, g_scanner_foreach_internal, d);