[Cluster-devel] cluster/group/lib libgroup.h

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-06-25 18:06:50

Modified files:
	group/lib      : libgroup.h 

Log message:
	Rename "private" to "priv" to make the file usable by C++ programs, and wrap the header with extern C { ... } if compiling C++.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/lib/libgroup.h.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.17&r2=1.17.2.1

--- cluster/group/lib/libgroup.h	2006/10/13 16:03:48	1.17
+++ cluster/group/lib/libgroup.h	2007/06/25 18:06:48	1.17.2.1
@@ -23,6 +23,10 @@
 #ifndef _LIBGROUP_H_
 #define _LIBGROUP_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MAX_GROUP_MEMBERS	256
 #define MAX_GROUP_NAME_LEN	32
 
@@ -33,16 +37,16 @@
 
 typedef void *group_handle_t;
 
-typedef void (*group_stop_t)(group_handle_t h, void *private, char *name);
-typedef void (*group_start_t)(group_handle_t h, void *private, char *name,
+typedef void (*group_stop_t)(group_handle_t h, void *priv, char *name);
+typedef void (*group_start_t)(group_handle_t h, void *priv, char *name,
 			      int event_nr, int type, int member_count,
 			      int *members);
-typedef void (*group_finish_t)(group_handle_t h, void *private, char *name,
+typedef void (*group_finish_t)(group_handle_t h, void *priv, char *name,
 			       int event_nr);
-typedef void (*group_terminate_t)(group_handle_t h, void *private, char *name);
-typedef void (*group_set_id_t)(group_handle_t h, void *private, char *name,
+typedef void (*group_terminate_t)(group_handle_t h, void *priv, char *name);
+typedef void (*group_set_id_t)(group_handle_t h, void *priv, char *name,
 			       unsigned int id);
-typedef void (*group_deliver_t)(group_handle_t h, void *private, char *name,
+typedef void (*group_deliver_t)(group_handle_t h, void *priv, char *name,
 			        int nodeid, int len, char *buf);
 
 typedef struct {
@@ -54,7 +58,7 @@
 	group_deliver_t deliver;
 } group_callbacks_t;
 
-group_handle_t group_init(void *private, char *prog_name, int level, group_callbacks_t *cbs, int timeout);
+group_handle_t group_init(void *priv, char *prog_name, int level, group_callbacks_t *cbs, int timeout);
 int group_exit(group_handle_t handle);
 
 int group_join(group_handle_t handle, char *name);
@@ -90,5 +94,8 @@
 int group_get_groups(int max, int *count, group_data_t *data);
 int group_get_group(int level, const char *name, group_data_t *data);
 
+#ifdef __cplusplus
+}
 #endif
 
+#endif