--- Libc/Libc-262.3.2/stdio/Makefile.inc
+++ Libc/Libc-320/stdio/Makefile.inc
@@ -1,47 +1,69 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 4/17/94
-# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.20 2001/03/27 17:26:52 ru Exp $
+# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.32 2003/01/10 06:22:28 tjr Exp $
 
 # stdio sources
 .PATH: ${.CURDIR}/stdio
 
-SRCS+=  clrerr.c findfp.c  fsetpos.c    mktemp.c     scanf.c      ungetc.c \
-	fclose.c flags.c   ftell.c      perror.c     setbuf.c     vfprintf.c \
-	fdopen.c fopen.c   funopen.c    printf.c     setbuffer.c  vfscanf.c \
-	feof.c   fprintf.c fvwrite.c    putc.c       setvbuf.c    vprintf.c \
-	ferror.c fpurge.c  fwalk.c      putchar.c    snprintf.c   vscanf.c \
-	fflush.c fputc.c   fwrite.c     puts.c       sprintf.c    vsnprintf.c \
-	fgetc.c  fputs.c   getc.c       putw.c       sscanf.c     vsprintf.c \
-	fgetln.c fread.c   getchar.c    refill.c     stdio.c      vsscanf.c \
-	fgetpos.c freopen.c gets.c       remove.c     tempnam.c    wbuf.c \
-	fgets.c  fscanf.c  getw.c       rewind.c     tmpfile.c    wsetup.c \
-	fileno.c fseek.c   makebuf.c    rget.c       tmpnam.c     asprintf.c \
-	vasprintf.c
+CFLAGS+= -DHEXFLOAT
 
+SRCS += hexfloat.c
+
+.include "Makefile.fbsd_begin"
+FBSDSRCS= _flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \
+	fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetws.c \
+	fileno.c findfp.c flags.c fopen.c fprintf.c fpurge.c fputc.c fputs.c \
+	fputwc.c fputws.c fread.c freopen.c fscanf.c fseek.c fsetpos.c \
+	ftell.c funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwscanf.c \
+	fwrite.c getc.c getchar.c gets.c getw.c getwc.c getwchar.c makebuf.c \
+	mktemp.c perror.c printf.c putc.c putchar.c puts.c putw.c putwc.c \
+	putwchar.c refill.c remove.c rewind.c rget.c scanf.c setbuf.c \
+	setbuffer.c setvbuf.c snprintf.c sprintf.c sscanf.c stdio.c \
+	swprintf.c swscanf.c tempnam.c tmpfile.c tmpnam.c ungetc.c ungetwc.c \
+	unlocked.c vasprintf.c vfprintf.c vfscanf.c vfwprintf.c vfwscanf.c \
+	vprintf.c vscanf.c vsnprintf.c vsprintf.c vsscanf.c vswprintf.c \
+	vswscanf.c vwprintf.c vwscanf.c wbuf.c wprintf.c wscanf.c wsetup.c
+FBSDORIGHDRS= floatio.h fvwrite.h glue.h local.h
+.include "Makefile.fbsd_end"
 
 .if ${LIB} == "c"
-MAN3+=	fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fopen.3 fputs.3 \
-	fread.3 fseek.3 funopen.3 getc.3 mktemp.3 printf.3 putc.3 remove.3 \
-	scanf.3 setbuf.3 stdio.3 tmpnam.3 ungetc.3
+.include "Makefile.fbsd_begin"
+FBSDMAN3= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetws.3 flockfile.3 \
+	fopen.3 fputs.3 fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 \
+	getwc.3 mktemp.3 printf.3 putc.3 putwc.3 remove.3 scanf.3 setbuf.3 \
+	stdio.3 tmpnam.3 ungetc.3 ungetwc.3 wprintf.3 wscanf.3
+.include "Makefile.fbsd_end"
 
-MLINKS+=ferror.3 clearerr.3 ferror.3 feof.3 ferror.3 fileno.3
+MLINKS+=ferror.3 ferror_unlocked.3 \
+	ferror.3 clearerr.3 ferror.3 clearerr_unlocked.3 \
+	ferror.3 feof.3 ferror.3 feof_unlocked.3 \
+	ferror.3 fileno.3 ferror.3 fileno_unlocked.3
 MLINKS+=fflush.3 fpurge.3
 MLINKS+=fgets.3 gets.3
+MLINKS+=flockfile.3 ftrylockfile.3 flockfile.3 funlockfile.3
 MLINKS+=fopen.3 fdopen.3 fopen.3 freopen.3
 MLINKS+=fputs.3 puts.3
 MLINKS+=fread.3 fwrite.3
 MLINKS+=fseek.3 fgetpos.3 fseek.3 fseeko.3 fseek.3 fsetpos.3 fseek.3 ftell.3 \
 	fseek.3 ftello.3 fseek.3 rewind.3
 MLINKS+=funopen.3 fropen.3 funopen.3 fwopen.3
-MLINKS+=getc.3 fgetc.3 getc.3 getchar.3 getc.3 getw.3
+MLINKS+=getc.3 fgetc.3 getc.3 getc_unlocked.3 getc.3 getchar.3 \
+	getc.3 getchar_unlocked.3 getc.3 getw.3
+MLINKS+=getwc.3 fgetwc.3 getwc.3 getwchar.3
 MLINKS+=mktemp.3 mkdtemp.3 mktemp.3 mkstemp.3 mktemp.3 mkstemps.3
 MLINKS+=printf.3 asprintf.3 printf.3 fprintf.3 \
 	printf.3 snprintf.3 printf.3 sprintf.3 \
 	printf.3 vasprintf.3 \
 	printf.3 vfprintf.3 printf.3 vprintf.3 printf.3 vsnprintf.3 \
 	printf.3 vsprintf.3
-MLINKS+=putc.3 fputc.3 putc.3 putchar.3 putc.3 putw.3
+MLINKS+=putc.3 fputc.3 putc.3 putc_unlocked.3 putc.3 putchar.3 \
+	putc.3 putchar_unlocked.3 putc.3 putw.3
+MLINKS+=putwc.3 fputwc.3 putwc.3 putwchar.3
 MLINKS+=scanf.3 fscanf.3 scanf.3 sscanf.3 scanf.3 vfscanf.3 scanf.3 vscanf.3 \
 	scanf.3 vsscanf.3
 MLINKS+=setbuf.3 setbuffer.3 setbuf.3 setlinebuf.3 setbuf.3 setvbuf.3
 MLINKS+=tmpnam.3 tempnam.3 tmpnam.3 tmpfile.3
+MLINKS+=wprintf.3 fwprintf.3 wprintf.3 swprintf.3 \
+	wprintf.3 vwprintf.3 wprintf.3 vfwprintf.3 wprintf.3 vswprintf.3
+MLINKS+=wscanf.3 fwscanf.3 wscanf.3 swscanf.3 wscanf.3 vwscanf.3 \
+	wscanf.3 vswscanf.3 wscanf.3 vfwscanf.3
 .endif