--- a/packages/isoinfra/current/ChangeLog
+++ b/packages/isoinfra/current/ChangeLog
@@ -1,3 +1,16 @@
+2004-03-12  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* cdl/isoinfra.cdl: Typo: CYGBLD_ISO_STDIO_FILEPOS ->
+	CYGBLD_ISO_STDIO_FILEPOS_HEADER.
+
+	* include/limits.h: Avoid potential illegal recursion if
+	already been included by GCC's limits.h.
+
+	* include/stdio.h: Include stdarg.h to save duplication.
+	Give fileno(),fdopen() throw specifiers.
+
+	* include/unistd.h: Prototype for rename() lives in stdio.h.
+
 2004-01-07  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* include/sys/select.h: Only declare pselect() when posix signals are

--- a/packages/isoinfra/current/cdl/isoinfra.cdl
+++ b/packages/isoinfra/current/cdl/isoinfra.cdl
@@ -257,7 +257,7 @@ cdl_package CYGPKG_ISOINFRA {
             requires      { 1 >= CYGINT_ISO_STDIO_FILEPOS }
         }
     
-        cdl_option CYGBLD_ISO_STDIO_FILEPOS {
+        cdl_option CYGBLD_ISO_STDIO_FILEPOS_HEADER {
             display       "Stdio file positioning implementation header"
             flavor        booldata
             default_value 0

--- a/packages/isoinfra/current/include/limits.h
+++ b/packages/isoinfra/current/include/limits.h
@@ -217,6 +217,9 @@
    world. So skip it by defining _LIBC_LIMITS_H_ */
 #define _LIBC_LIMITS_H_
 
-#include_next <limits.h>
+/* Secondly only include if we haven't already been included by it. */
+#ifndef _GCC_LIMITS_H_
+# include_next <limits.h>
+#endif
 
 /* EOF limits.h */

--- a/packages/isoinfra/current/include/stdio.h
+++ b/packages/isoinfra/current/include/stdio.h
@@ -69,6 +69,13 @@
 #define __need_size_t
 #include <stddef.h>
 
+/*  Misc functions below use varargs stuff, so pull it in from the compiler
+ *  here to save duplication.
+ */
+
+#define __need___va_list
+#include <stdarg.h>
+
 #ifdef CYGINT_ISO_STDIO_FILETYPES
 # ifdef CYGBLD_ISO_STDIO_FILETYPES_HEADER
 #  include CYGBLD_ISO_STDIO_FILETYPES_HEADER
@@ -133,10 +140,10 @@ extern "C" {
 #  endif
 
 extern int
-fileno( FILE *__stream );
+fileno( FILE *__stream ) __THROW;
 
 extern FILE *
-fdopen( int __fildes, const char *__type );
+fdopen( int __fildes, const char *__type ) __THROW;
 
 #  ifdef __cplusplus
 } // extern "C"

--- a/packages/isoinfra/current/include/unistd.h
+++ b/packages/isoinfra/current/include/unistd.h
@@ -222,7 +222,6 @@ extern "C" {
 extern int 	link(const char *path1, const char *path2);
 extern int 	unlink(const char *path);
 extern int 	rmdir(const char *path);
-extern int 	rename(const char *old_name, const char *new_name);
 extern int 	access(const char *path, int amode);
 extern int 	chown(const char *path, uid_t owner, uid_t group);
 extern long 	pathconf(const char *path, int name);