Updated to fedora-glibc-20071212T1051

3 files changed, 25 insertions, 4 deletions

diff --git a/include/ifaddrs.h b/include/ifaddrs.h
index 71bdaeb180..50e4c48e82 100644
--- a/include/ifaddrs.h
+++ b/include/ifaddrs.h
@@ -10,14 +10,19 @@ struct in6addrinfo
 {
   enum {
     in6ai_deprecated = 1,
-    in6ai_temporary = 2,
-    in6ai_homeaddress = 4
-  } flags;
+    in6ai_homeaddress = 2
+  } flags:8;
+  uint8_t prefixlen;
+  uint16_t :16;
+  uint32_t index;
   uint32_t addr[4];
 };
 
 extern void __check_pf (bool *seen_ipv4, bool *seen_ipv6,
 			struct in6addrinfo **in6ai, size_t *in6ailen)
   attribute_hidden;
+extern void __check_native (uint32_t a1_index, int *a1_native,
+			    uint32_t a2_index, int *a2_native)
+  attribute_hidden;
 
 #endif	/* ifaddrs.h */
diff --git a/include/netdb.h b/include/netdb.h
index 0bf84c21c0..9bbe31b438 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -62,6 +62,14 @@ extern int __old_gethostbyaddr_r (__const void *__restrict __addr,
 				  struct hostent **__restrict __result,
 				  int *__restrict __h_errnop);
 
+extern int __gethostbyaddr2_r (__const void *__restrict __addr,
+			       socklen_t __len, int __type,
+			       struct hostent *__restrict __result_buf,
+			       char *__restrict __buf, size_t __buflen,
+			       struct hostent **__restrict __result,
+			       int *__restrict __h_errnop,
+			       int32_t *ttlp);
+
 extern int __gethostbyname_r (__const char *__restrict __name,
 			      struct hostent *__restrict __result_buf,
 			      char *__restrict __buf, size_t __buflen,
@@ -84,6 +92,13 @@ extern int __old_gethostbyname2_r (__const char *__restrict __name, int __af,
 				   struct hostent **__restrict __result,
 				   int *__restrict __h_errnop);
 
+extern int __gethostbyname3_r (__const char *__restrict __name, int __af,
+			       struct hostent *__restrict __result_buf,
+			       char *__restrict __buf, size_t __buflen,
+			       struct hostent **__restrict __result,
+			       int *__restrict __h_errnop,
+			       int32_t *ttlp, char **canonp);
+
 extern int __getnetent_r (struct netent *__restrict __result_buf,
 			  char *__restrict __buf, size_t __buflen,
 			  struct netent **__restrict __result,
diff --git a/include/stdlib.h b/include/stdlib.h
index a9754b71dd..883bc34d4a 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -32,6 +32,7 @@ libc_hidden_proto (abort)
 libc_hidden_proto (getenv)
 libc_hidden_proto (bsearch)
 libc_hidden_proto (qsort)
+libc_hidden_proto (qsort_r)
 libc_hidden_proto (lrand48_r)
 libc_hidden_proto (wctomb)
 libc_hidden_proto (__secure_getenv)
@@ -83,7 +84,7 @@ extern int __add_to_environ (const char *name, const char *value,
 			     const char *combines, int replace);
 
 extern void _quicksort (void *const pbase, size_t total_elems,
-			size_t size, __compar_fn_t cmp);
+			size_t size, __compar_d_fn_t cmp, void *arg);
 
 extern int __on_exit (void (*__func) (int __status, void *__arg), void *__arg);