[Cluster-devel] cluster/magma/lib magma.h

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-10-10 17:13:57

Modified files:
	magma/lib      : magma.h 

Log message:
	Don't use 'new' as an identifier in function prototypes to allow the header to be included by C++ programs.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/magma/lib/magma.h.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.9.2.4&r2=1.9.2.5

--- cluster/magma/lib/Attic/magma.h	2006/06/16 19:54:07	1.9.2.4
+++ cluster/magma/lib/Attic/magma.h	2007/10/10 17:13:57	1.9.2.5
@@ -215,9 +215,9 @@
  * memberlist.c: Membership deltas.
  */
 cluster_member_list_t *memb_gained(cluster_member_list_t *old,
-		 		   cluster_member_list_t *new);
+		 		   cluster_member_list_t *new_memb);
 cluster_member_list_t *memb_lost(cluster_member_list_t *old,
-	 			 cluster_member_list_t *new);
+	 			 cluster_member_list_t *new_memb);
 
 /*
  * memberlist.c: Utilities for finding nodes
@@ -234,7 +234,7 @@
  * Functions to resolve hostnames to ipv4/ipv6 addresses
  */
 int memb_resolve(cluster_member_t *member);
-int memb_resolve_list(cluster_member_list_t *new, cluster_member_list_t *old);
+int memb_resolve_list(cluster_member_list_t *newl, cluster_member_list_t *old);
 
 /*
  * address.c: Utilities for dealing with addresses