[PATCH] Fix build break from ifaddrs.h

[PATCH] Fix build break from ifaddrs.h

[Steven Munroe]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

Todays CVS breaks in sunrpc/pmap_cint.c because uint32_t is not defined.
Adding the include <stdint.h> fixed this. But there are additional
failure in make check. posix/tst-rfc3484.c and tst-rfc3484-2.c fail
because they redefine __check_pf and the prototype does not match. I
updated tst-rfc3484.c and tst-rfc3484-2.c to match ifaddrs.h.

That seems to get tst-rfc3484.c and tst-rfc3484-2.c working but I am
still see failures in posix/tst-getaddrinfo and posix/tst-getaddrinfo-2.
I have not debugges these yet.



[-- Attachment #2: ppc-ifaddrs-20060419.txt --]
[-- Type: text/plain, Size: 1812 bytes --]

2006-04-19  Steven Munroe  <sjmunroe@us.ibm.com>

	* include/ifaddrs.h: Include <stdint.h>

	* posix/tst-rfc3484-2.c (__check_pf): Update prototype to match
	ifaddrs.h.
	* posix/tst-rfc3484.c (__check_pf): Likewise.

diff -urN libc24-cvstip-20060419/include/ifaddrs.h libc24/include/ifaddrs.h
--- libc24-cvstip-20060419/include/ifaddrs.h	2006-04-16 16:26:00.000000000 -0500
+++ libc24/include/ifaddrs.h	2006-04-19 15:35:40.000000000 -0500
@@ -1,6 +1,7 @@
 #ifndef _IFADDRS_H
 #include <inet/ifaddrs.h>
 #include <stdbool.h>
+#include <stdint.h>
 
 libc_hidden_proto (getifaddrs)
 libc_hidden_proto (freeifaddrs)
diff -urN libc24-cvstip-20060419/posix/tst-rfc3484-2.c libc24/posix/tst-rfc3484-2.c
--- libc24-cvstip-20060419/posix/tst-rfc3484-2.c	2006-04-15 16:41:54.000000000 -0500
+++ libc24/posix/tst-rfc3484-2.c	2006-04-19 15:11:35.000000000 -0500
@@ -1,5 +1,6 @@
 #include <stdbool.h>
 #include <stdio.h>
+#include <ifaddrs.h>
 
 /* Internal definitions used in the libc code.  */
 #define __getservbyname_r getservbyname_r
@@ -11,7 +12,8 @@
 
 void
 attribute_hidden
-__check_pf (bool *p1, bool *p2)
+__check_pf (bool *p1, bool *p2,
+	    struct in6addrinfo **in6ai, size_t *in6ailen)
 {
   *p1 = *p2 = true;
 }
diff -urN libc24-cvstip-20060419/posix/tst-rfc3484.c libc24/posix/tst-rfc3484.c
--- libc24-cvstip-20060419/posix/tst-rfc3484.c	2005-09-26 16:12:49.000000000 -0500
+++ libc24/posix/tst-rfc3484.c	2006-04-19 15:06:41.000000000 -0500
@@ -1,5 +1,6 @@
 #include <stdbool.h>
 #include <stdio.h>
+#include <ifaddrs.h>
 
 /* Internal definitions used in the libc code.  */
 #define __getservbyname_r getservbyname_r
@@ -11,7 +12,8 @@
 
 void
 attribute_hidden
-__check_pf (bool *p1, bool *p2)
+__check_pf (bool *p1, bool *p2,
+	    struct in6addrinfo **in6ai, size_t *in6ailen)
 {
   *p1 = *p2 = true;
 }