Updated to fedora-glibc-20051020T0651

5 files changed, 19 insertions, 15 deletions

diff --git a/include/dirent.h b/include/dirent.h
index b040a042d3..4e95ffd6cd 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -2,6 +2,7 @@
 # include <dirstream.h>
 # include <dirent/dirent.h>
 # include <sys/stat.h>
+# include <stdbool.h>
 
 /* Now define the internal interfaces.  */
 extern DIR *__opendir (__const char *__name);
@@ -24,5 +25,6 @@ extern int __alphasort64 (const void *a, const void *b)
      __attribute_pure__;
 extern int __versionsort64 (const void *a, const void *b)
      __attribute_pure__;
-extern DIR *__alloc_dir (int fd, struct stat64 *statp) internal_function;
+extern DIR *__alloc_dir (int fd, bool close_fd, struct stat64 *statp)
+     internal_function;
 #endif
diff --git a/include/features.h b/include/features.h
index 3288bb501c..4c93af7c0b 100644
--- a/include/features.h
+++ b/include/features.h
@@ -186,8 +186,10 @@
 # define _POSIX_SOURCE	1
 # if defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) < 500
 #  define _POSIX_C_SOURCE	2
-# else
+# elif defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) < 600
 #  define _POSIX_C_SOURCE	199506L
+# else
+#  define _POSIX_C_SOURCE	200112L
 # endif
 #endif
 
diff --git a/include/limits.h b/include/limits.h
index 45cd6f2532..3e9a5df88a 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991, 92, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1996, 1997, 1998, 1999, 2000, 2005
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -122,20 +123,20 @@
 #if defined __GNUC__ && !defined _GCC_LIMITS_H_
 /* `_GCC_LIMITS_H_' is what GCC's file defines.  */
 # include_next <limits.h>
+#endif
 
 /* The <limits.h> files in some gcc versions don't define LLONG_MIN,
    LLONG_MAX, and ULLONG_MAX.  Instead only the values gcc defined for
    ages are available.  */
-# ifdef __USE_ISOC99
-#  ifndef LLONG_MIN
-#   define LLONG_MIN	LONG_LONG_MIN
-#  endif
-#  ifndef LLONG_MAX
-#   define LLONG_MAX	LONG_LONG_MAX
-#  endif
-#  ifndef ULLONG_MAX
-#   define ULLONG_MAX	ULONG_LONG_MAX
-#  endif
+#if defined __USE_ISOC99 && defined __GNUC__
+# ifndef LLONG_MIN
+#  define LLONG_MIN	(-LLONG_MAX-1)
+# endif
+# ifndef LLONG_MAX
+#  define LLONG_MAX	__LONG_LONG_MAX__
+# endif
+# ifndef ULLONG_MAX
+#  define ULLONG_MAX	(LLONG_MAX * 2ULL + 1)
 # endif
 #endif
 
diff --git a/include/malloc.h b/include/malloc.h
index f0164a6273..1a20248559 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -12,7 +12,6 @@ extern int __malloc_initialized attribute_hidden;
 struct malloc_state;
 typedef struct malloc_state *mstate;
 
-extern mstate         _int_new_arena (size_t __ini_size) attribute_hidden;
 extern __malloc_ptr_t _int_malloc (mstate __m, size_t __size) attribute_hidden;
 extern void           _int_free (mstate __m, __malloc_ptr_t __ptr)
      attribute_hidden;
diff --git a/include/sys/mman.h b/include/sys/mman.h
index 14e757892e..8c07a4e2c6 100644
--- a/include/sys/mman.h
+++ b/include/sys/mman.h
@@ -11,5 +11,5 @@ extern int __mprotect (void *__addr, size_t __len, int __prot);
 
 /* This one is Linux specific.  */
 extern void *__mremap (void *__addr, size_t __old_len,
-		       size_t __new_len, int __may_move);
+		       size_t __new_len, int __flags, ...);
 #endif