Call from c++ modification

wb/lib/wb/src/wb_trv.h

 /* 
- * Proview   $Id: wb_trv.h,v 1.5 2005-09-06 10:43:32 claes Exp $
+ * Proview   $Id: wb_trv.h,v 1.6 2005-11-22 12:26:24 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -24,6 +24,10 @@
 #include "wb_ldh.h"
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef enum {
   trv_eDepth_Deep,
   trv_eDepth_Children,
@@ -164,7 +168,11 @@ int trv_get_docobjects (
 
 int trv_object_search(
   trv_ctx	trvctx,
+#ifdef __cplusplus
+  int		(*backcall)( pwr_sAttrRef *, void *, void *, void *, void *, void*),
+#else
   int		(*backcall)(),
+#endif
   void		*arg1,
   void		*arg2,
   void		*arg3,
@@ -199,5 +207,9 @@ int trv_get_attrobjects (
   void		*arg5
 );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 

wb/lib/wb/src/wb_utl.c

 /* 
- * Proview   $Id: wb_utl.c,v 1.20 2005-11-02 14:30:44 claes Exp $
+ * Proview   $Id: wb_utl.c,v 1.21 2005-11-22 12:26:58 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -1360,14 +1360,17 @@ void utl_objidlist_free( utl_t_objidlist *list)
 
 int utl_objidlist_insert (
   pwr_sAttrRef  *arp,
-  utl_t_objidlist **list,
-  int		*count,
-  int		dum1,
-  int		dum2,
-  int		dum3
+  void		*l,
+  void		*c,
+  void		*dum1,
+  void		*dum2,
+  void		*dum3
 )
 {
 	utl_t_objidlist	*list_ptr;
+	utl_t_objidlist **list = (utl_t_objidlist **) l;
+	int *count = (int *) c;
+	
 	
 	if ( *list)
 	{

wb/lib/wb/src/wb_utl.h

 /* 
- * Proview   $Id: wb_utl.h,v 1.7 2005-09-06 10:43:32 claes Exp $
+ * Proview   $Id: wb_utl.h,v 1.8 2005-11-22 12:26:58 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -28,6 +28,11 @@
 #include <X11/Intrinsic.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 typedef struct utl_s_objidlist {
 	pwr_tObjid  objid;
 	struct utl_s_objidlist *next;
@@ -49,11 +54,11 @@ void utl_objidlist_free (
 
 int utl_objidlist_insert (
   pwr_sAttrRef  *arp,
-  utl_t_objidlist **list,
-  int		*count,
-  int		dum1,
-  int		dum2,
-  int		dum3
+  void		*l,
+  void		*c,
+  void		*dum1,
+  void		*dum2,
+  void		*dum3
 );
 
 int utl_toupper ( 
@@ -496,4 +501,8 @@ int utl_revert (
   int		confirm
 );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif