__ctype_ should be __ctype

[unix-history] / usr / src / include / stdio.h

diff --git a/usr/src/include/stdio.h b/usr/src/include/stdio.h
index 1b489d0..1b6aab3 100644 (file)
--- a/usr/src/include/stdio.h
+++ b/usr/src/include/stdio.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)stdio.h     5.14 (Berkeley) %G%
+ *     @(#)stdio.h     5.19 (Berkeley) %G%

  */
 
 #ifndef        _STDIO_H_
  */
 
 #ifndef        _STDIO_H_


@@ -15,7 +15,7 @@
 
 #include <sys/cdefs.h>
 
 
 #include <sys/cdefs.h>
 

-#include <machine/types.h>
+#include <machine/ansi.h>

 #ifdef _SIZE_T_
 typedef        _SIZE_T_        size_t;
 #undef _SIZE_T_
 #ifdef _SIZE_T_
 typedef        _SIZE_T_        size_t;
 #undef _SIZE_T_


@@ -179,16 +179,20 @@ FILE      *fopen __P((const char *, const char *));
 int     fprintf __P((FILE *, const char *, ...));
 int     fputc __P((int, FILE *));
 int     fputs __P((const char *, FILE *));
 int     fprintf __P((FILE *, const char *, ...));
 int     fputc __P((int, FILE *));
 int     fputs __P((const char *, FILE *));

-int     fread __P((void *, size_t, size_t, FILE *));
+size_t  fread __P((void *, size_t, size_t, FILE *));

 FILE   *freopen __P((const char *, const char *, FILE *));
 int     fscanf __P((FILE *, const char *, ...));
 int     fseek __P((FILE *, long, int));
 int     fsetpos __P((FILE *, const fpos_t *));
 long    ftell __P((const FILE *));
 FILE   *freopen __P((const char *, const char *, FILE *));
 int     fscanf __P((FILE *, const char *, ...));
 int     fseek __P((FILE *, long, int));
 int     fsetpos __P((FILE *, const fpos_t *));
 long    ftell __P((const FILE *));

-int     fwrite __P((const void *, size_t, size_t, FILE *));
+size_t  fwrite __P((const void *, size_t, size_t, FILE *));

 int     getc __P((FILE *));
 int     getchar __P((void));
 char   *gets __P((char *));
 int     getc __P((FILE *));
 int     getchar __P((void));
 char   *gets __P((char *));

+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
+extern int sys_nerr;                   /* perror(3) external variables */
+extern char *sys_errlist[];
+#endif

 void    perror __P((const char *));
 int     printf __P((const char *, ...));
 int     putc __P((int, FILE *));
 void    perror __P((const char *));
 int     printf __P((const char *, ...));
 int     putc __P((int, FILE *));


@@ -240,6 +244,8 @@ int  setlinebuf __P((FILE *));
 char   *tempnam __P((const char *, const char *));
 int     snprintf __P((char *, size_t, const char *, ...));
 int     vsnprintf __P((char *, size_t, const char *, _VA_LIST_));
 char   *tempnam __P((const char *, const char *));
 int     snprintf __P((char *, size_t, const char *, ...));
 int     vsnprintf __P((char *, size_t, const char *, _VA_LIST_));

+int     vscanf __P((const char *, _VA_LIST_));
+int     vsscanf __P((const char *, const char *, _VA_LIST_));

 __END_DECLS
 
 /*
 __END_DECLS
 
 /*


@@ -278,7 +284,7 @@ __END_DECLS
  */
 #define        __sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
 #if defined(__GNUC__) && defined(__STDC__)
  */
 #define        __sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
 #if defined(__GNUC__) && defined(__STDC__)

-static inline int __sputc(int _c, FILE *_p) {
+static __inline int __sputc(int _c, FILE *_p) {

        if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
                return (*_p->_p++ = _c);
        else
        if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
                return (*_p->_p++ = _c);
        else