--- ./include/orbit/orb-core/allocators.h.orig	2014-06-25 13:43:04 +0200
+++ ./include/orbit/orb-core/allocators.h	2014-06-25 13:43:14 +0200
@@ -41,7 +41,7 @@
     Below, some magic values of the fnc ptr are defined.
 **/
 typedef gpointer (*ORBit_Mem_free_fn) (gpointer mem,
-				       gpointer func_data);
+				       gpointer gfunc_data);
 
 #define ORBIT_MEMHOW_HOW(how)      ((how) & 0x3)
 #define ORBIT_MEMHOW_ELEMENTS(how) ((how) >> 2)
--- ./src/idl-compiler/orbit-idl-utils.c.orig	2014-06-25 13:40:59 +0200
+++ ./src/idl-compiler/orbit-idl-utils.c	2014-06-25 13:41:46 +0200
@@ -362,7 +362,7 @@
 
 static void
 IDL_tree_traverse_helper(IDL_tree p, GFunc f,
-			 gconstpointer func_data,
+			 gconstpointer gfunc_data,
 			 GHashTable *visited_nodes,
 			 gboolean    include_self)
 {
@@ -376,17 +376,17 @@
 	for (curitem = IDL_INTERFACE (p).inheritance_spec; curitem;
 	     curitem = IDL_LIST (curitem).next) {
 		IDL_tree_traverse_helper (IDL_get_parent_node 
-			(IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, func_data, visited_nodes, TRUE);
+			(IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, gfunc_data, visited_nodes, TRUE);
 	}
 
 	if (include_self)
-		f(p, (gpointer)func_data);
+		f(p, (gpointer)gfunc_data);
 }
 
 void
 IDL_tree_traverse_parents_full (IDL_tree      p,
 				GFunc         f,
-				gconstpointer func_data,
+				gconstpointer gfunc_data,
 				gboolean      include_self)
 {
 	GHashTable *visited_nodes = g_hash_table_new (NULL, g_direct_equal);
@@ -400,7 +400,7 @@
 	if (!p)
 		return;
 
-	IDL_tree_traverse_helper (p, f, func_data, visited_nodes, include_self);
+	IDL_tree_traverse_helper (p, f, gfunc_data, visited_nodes, include_self);
 
 	g_hash_table_destroy (visited_nodes);
 }
@@ -408,9 +408,9 @@
 void
 IDL_tree_traverse_parents (IDL_tree p,
 			   GFunc f,
-			   gconstpointer func_data)
+			   gconstpointer gfunc_data)
 {
-	IDL_tree_traverse_parents_full (p, f, func_data, TRUE);
+	IDL_tree_traverse_parents_full (p, f, gfunc_data, TRUE);
 }
 
 /* For use by below function */
--- ./src/idl-compiler/orbit-idl2.h.orig	2014-06-25 13:40:55 +0200
+++ ./src/idl-compiler/orbit-idl2.h	2014-06-25 13:41:46 +0200
@@ -16,10 +16,10 @@
 					  int           indent_level);
 void     IDL_tree_traverse_parents       (IDL_tree      p,
 					  GFunc         f,
-					  gconstpointer func_data);
+					  gconstpointer gfunc_data);
 void     IDL_tree_traverse_parents_full  (IDL_tree      p,
 					  GFunc         f,
-					  gconstpointer func_data, 
+					  gconstpointer gfunc_data, 
 					  gboolean      include_self);
 gboolean orbit_cbe_type_contains_complex (IDL_tree      ts);
 void     orbit_idl_check_oneway_op       (IDL_tree      op);