Avoid the use of kernel defines in libipvs userland prototypes

* fix libipvs-2.4 ipvs_get_service(...) prototype to use ISO types instead of kernel ones... * fix libipvs-2.6 ipvs_get_service(...) prototype to use ISO types instead of kernel ones...
jfharden · Aug 14, 2012 · 72f8f6b · 72f8f6b
1 parent 01874a9
commit 72f8f6b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/keepalived/libipvs-2.6/libipvs.c b/keepalived/libipvs-2.6/libipvs.c
@@ -879,7 +879,8 @@ void ipvs_sort_dests(struct ip_vs_get_dests *d, ipvs_dest_cmp_t f)
 
 
 ipvs_service_entry_t *
-ipvs_get_service(__u32 fwmark, __u16 af, __u16 protocol, union nf_inet_addr addr, __u16 port)
+ipvs_get_service(u_int32_t fwmark, u_int16_t af, u_int16_t protocol, union nf_inet_addr addr,
+		 u_int16_t port)
 {
 	ipvs_service_entry_t *svc;
 	socklen_t len;

diff --git a/keepalived/libipvs-2.6/libipvs.h b/keepalived/libipvs-2.6/libipvs.h
@@ -96,7 +96,8 @@ extern void ipvs_sort_services(struct ip_vs_get_services *s,
 			       ipvs_service_cmp_t f);
 
 /* get one IPVS service */
-extern ipvs_service_entry_t *ipvs_get_service(__u32, __u16, __u16, union nf_inet_addr, __u16);
+extern ipvs_service_entry_t *ipvs_get_service(u_int32_t, u_int16_t, u_int16_t,
+					      union nf_inet_addr, u_int16_t);
 
 /* get the destination array of the specified service */
 extern struct ip_vs_get_dests *ipvs_get_dests(ipvs_service_entry_t *svc);