Sat Nov 18 16:46:01 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>

	* libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c,
	libio/ferror.c, libio/fgetc.c, libio/filedoalloc.c, libio/fileno.c,
	libio/fileops.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
	libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
	libio/iofdopen.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
	libio/iofopen.c, libio/iofprintf.c, libio/iofputs.c, libio/iofread.c,
	libio/iofscanf.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c,
	libio/iogetdelim.c, libio/iogetline.c, libio/iogets.c, libio/iolibio.h,
	libio/iopadn.c, libio/ioprims.c, libio/ioputs.c, libio/ioseekoff.c,
	libio/ioseekpos.c, libio/iosetbuffer.c, libio/iosetvbuf.c,
	libio/iosprintf.c, libio/ioungetc.c, libio/iovsprintf.c,
	libio/iovsscanf.c, libio/libio.h, libio/libioP.h, libio/putc.c,
	libio/putchar.c, libio/rewind.c, libio/setbuf.c, libio/setlinebuf.c,
	libio/stdfiles.c, libio/stdio.c, libio/stdio.h, libio/strfile.h,
	libio/strops.c, libio/vasprintf.c, libio/vscanf.c, libio/vsnprintf.c:
	New files.  Slightly modified version from Linux libc.

	* libio/memstream.c, libio/vdprintf.c: New files for functions not
	(yet) part of GNU libio.

	* libio/iofopncook.c: Implementation of `fopencookie', mainly written
	by Per Bothner.

	* stdio-common/getline.c: Adapted to libio.
	* stdio-common/snprintf.c: Adapted to libio.
	* stdio-common/vfprintf.c: Adapted to libio.
	* stdio-common/vfscanf.c: Adapted to libio.
	* sysdeps/posix/tempname.c: Adapted to libio.

2 files changed, 12 insertions, 12 deletions

diff --git a/stdlib/strtod.c b/stdlib/strtod.c
index b7c717a823..e60617ffac 100644
--- a/stdlib/strtod.c
+++ b/stdlib/strtod.c
@@ -70,7 +70,7 @@ extern FLOAT MPN2FLOAT (mp_srcptr mpn, int exponent, int negative);
 #  define MAX_DIG_PER_LIMB	19
 #  define MAX_FAC_PER_LIMB	10000000000000000000L
 #else
-#  error "mp_limb size " BITS_PER_MP_LIMB "not accounted for"	
+#  error "mp_limb size " BITS_PER_MP_LIMB "not accounted for"
 #endif
 
 
@@ -102,7 +102,7 @@ static const mp_limb _tens_in_limb[MAX_DIG_PER_LIMB + 1] =
 #define RETURN(val,end) \
     do { if (endptr != 0) *endptr = (char *) (end); return val; } while (0)
 
-/* Maximum size necessary for mpn integers to hold floating point numbers.  */ 
+/* Maximum size necessary for mpn integers to hold floating point numbers.  */
 #define	MPNSIZE		(howmany (MAX_EXP + 2 * MANT_DIG, BITS_PER_MP_LIMB) \
 			 + 2)
 /* Declare an mpn integer variable that big.  */
@@ -584,7 +584,7 @@ INTERNAL (STRTOF) (nptr, endptr, group)
     {
       errno = ERANGE;
       return 0.0;
-    }	
+    }
 
   if (int_no > 0)
     {
@@ -797,7 +797,7 @@ INTERNAL (STRTOF) (nptr, endptr, group)
 	dig_no -= lead_zero;
       }
 
-    /* Read the fractional digits from the string.  */ 
+    /* Read the fractional digits from the string.  */
     (void) str_to_mpn (startp, dig_no - int_no, num, &numsize, &exponent);
 
 
@@ -964,7 +964,7 @@ INTERNAL (STRTOF) (nptr, endptr, group)
 	    have_quot:
 	      got_limb;
 	    }
-	    
+
 	  return round_and_return (retval, exponent - 1, negative,
 				   quot, BITS_PER_MP_LIMB - 1 - used,
 				   more_bits || n1 != 0 || n0 != 0);
@@ -1105,9 +1105,6 @@ INTERNAL (STRTOF) (nptr, endptr, group)
 
 /* External user entry point.  */
 
-#define weak_this(x) weak_symbol(x)
-weak_this (STRTOF)
-
 FLOAT
 STRTOF (nptr, endptr)
      const char *nptr;
@@ -1115,3 +1112,6 @@ STRTOF (nptr, endptr)
 {
   return INTERNAL (STRTOF) (nptr, endptr, 0);
 }
+
+#define weak_this(x) weak_symbol(x)
+weak_this (STRTOF)
diff --git a/stdlib/strtol.c b/stdlib/strtol.c
index 8c1a683880..d52f338c84 100644
--- a/stdlib/strtol.c
+++ b/stdlib/strtol.c
@@ -277,10 +277,6 @@ noconv:
 
 /* External user entry point.  */
 
-#ifdef weak_symbol
-weak_symbol (strtol)
-#endif
-
 INT
 strtol (nptr, endptr, base)
      const char *nptr;
@@ -289,3 +285,7 @@ strtol (nptr, endptr, base)
 {
   return INTERNAL (strtol) (nptr, endptr, base, 0);
 }
+
+#ifdef weak_symbol
+weak_symbol (strtol)
+#endif