[Cluster-devel] cluster/cman/lib libcman.h

[pcaulfield at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	pcaulfield at sourceware.org	2006-09-01 08:37:10

Modified files:
	cman/lib       : libcman.h 

Log message:
	Rename 'private' to 'privdata' so it doesn't upset c++

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/libcman.h.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.2.6.1.2.5&r2=1.2.6.1.2.6

--- cluster/cman/lib/libcman.h	2006/04/26 08:55:26	1.2.6.1.2.5
+++ cluster/cman/lib/libcman.h	2006/09/01 08:37:10	1.2.6.1.2.6
@@ -81,22 +81,22 @@
 } cman_cluster_t;
 
 /* Callback routine for a membership event */
-typedef void (*cman_callback_t)(cman_handle_t handle, void *private, int reason, int arg);
+typedef void (*cman_callback_t)(cman_handle_t handle, void *privdata, int reason, int arg);
 
 /* Callback routine for data received */
-typedef void (*cman_datacallback_t)(cman_handle_t handle, void *private,
+typedef void (*cman_datacallback_t)(cman_handle_t handle, void *privdata,
 				    char *buf, int len, uint8_t port, int nodeid);
 
 
 /* cman_init    returns the handle you need to pass to the other API calls,
    cman_finish  destroys that handle
 */
-cman_handle_t cman_init(void *private);
+cman_handle_t cman_init(void *privdata);
 int cman_finish(cman_handle_t handle);
 
 /* Update/retrieve private data */
-int cman_set_private(cman_handle_t *h, void *private);
-int cman_get_private(cman_handle_t *h, void **private);
+int cman_set_private(cman_handle_t *h, void *privdata);
+int cman_get_private(cman_handle_t *h, void **privdata);
 
 /* Notification of membership change events. NOte that these are sent after
    a transition so multiple nodes may have left the cluster (but a maximum of