[BACK]Return to stdio.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / include

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/include/stdio.h between version 1.82.2.2 and 1.86

version 1.82.2.2, 2014/08/20 00:02:05 version 1.86, 2013/04/19 23:42:26
Line 242  long  ftell(FILE *);
Line 242  long  ftell(FILE *);
 size_t   fwrite(const void * __restrict, size_t, size_t, FILE * __restrict);  size_t   fwrite(const void * __restrict, size_t, size_t, FILE * __restrict);
 int      getc(FILE *);  int      getc(FILE *);
 int      getchar(void);  int      getchar(void);
   ssize_t  getdelim(char ** __restrict, size_t * __restrict, int,
               FILE * __restrict);
   ssize_t  getline(char ** __restrict, size_t * __restrict, FILE * __restrict);
 void     perror(const char *);  void     perror(const char *);
 int      printf(const char * __restrict, ...)  int      printf(const char * __restrict, ...)
                 __printflike(1, 2);                  __printflike(1, 2);
Line 458  __END_DECLS
Line 461  __END_DECLS
 #if defined(__GNUC__) && defined(__STDC__)  #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'))          if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
                 return *_p->_p++ = (unsigned char)_c;                  return (*_p->_p++ = _c);
         else          else
                 return __swbuf(_c, _p);                  return (__swbuf(_c, _p));
 }  }
 #else  #else
 /*  /*
Line 482  static __inline int __sputc(int _c, FILE
Line 485  static __inline int __sputc(int _c, FILE
 #define __sfileno(p)    \  #define __sfileno(p)    \
     ((p)->_file == -1 ? -1 : (int)(unsigned short)(p)->_file)      ((p)->_file == -1 ? -1 : (int)(unsigned short)(p)->_file)
   
 #if !defined(__lint__) && !defined(__cplusplus)  #ifndef __lint__
 #if !defined(_REENTRANT) && !defined(_PTHREADS)  #if !defined(_REENTRANT) && !defined(_PTHREADS)
 #define feof(p)         __sfeof(p)  #define feof(p)         __sfeof(p)
 #define ferror(p)       __sferror(p)  #define ferror(p)       __sferror(p)
Line 491  static __inline int __sputc(int _c, FILE
Line 494  static __inline int __sputc(int _c, FILE
 #define getc(fp)        __sgetc(fp)  #define getc(fp)        __sgetc(fp)
 #define putc(x, fp)     __sputc(x, fp)  #define putc(x, fp)     __sputc(x, fp)
 #endif /* !_REENTRANT && !_PTHREADS */  #endif /* !_REENTRANT && !_PTHREADS */
   #endif /* __lint__ */
   
 #define getchar()       getc(stdin)  #define getchar()       getc(stdin)
 #define putchar(x)      putc(x, stdout)  #define putchar(x)      putc(x, stdout)
   
 #endif /* !__lint__ && !__cplusplus */  #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
       defined(_NETBSD_SOURCE)
 #if (defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \  
     defined(_NETBSD_SOURCE)) && !defined(__cplusplus)  
 #if !defined(_REENTRANT) && !defined(_PTHREADS)  #if !defined(_REENTRANT) && !defined(_PTHREADS)
 #define fileno(p)       __sfileno(p)  #define fileno(p)       __sfileno(p)
 #endif /* !_REENTRANT && !_PTHREADS */  #endif /* !_REENTRANT && !_PTHREADS */
 #endif /* !_ANSI_SOURCE && !__cplusplus*/  #endif /* !_ANSI_SOURCE */
   
 #if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)  #if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)
 __BEGIN_DECLS  
 int      vdprintf(int, const char * __restrict, __va_list)  int      vdprintf(int, const char * __restrict, __va_list)
                 __printflike(2, 0);                  __printflike(2, 0);
 int      dprintf(int, const char * __restrict, ...)  int      dprintf(int, const char * __restrict, ...)
                 __printflike(2, 3);                  __printflike(2, 3);
 __END_DECLS  
 #endif /* (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE) */  #endif /* (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE) */
   
 #if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \  #if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \
     defined(_REENTRANT) || defined(_NETBSD_SOURCE) && !defined(__cplusplus)      defined(_REENTRANT) || defined(_NETBSD_SOURCE)
 #define getc_unlocked(fp)       __sgetc(fp)  #define getc_unlocked(fp)       __sgetc(fp)
 #define putc_unlocked(x, fp)    __sputc(x, fp)  #define putc_unlocked(x, fp)    __sputc(x, fp)
   
Line 524  __END_DECLS
Line 524  __END_DECLS
   
 #if (_POSIX_C_SOURCE - 0) >= 200809L || (_XOPEN_SOURCE - 0) >= 700 || \  #if (_POSIX_C_SOURCE - 0) >= 200809L || (_XOPEN_SOURCE - 0) >= 700 || \
     defined(_NETBSD_SOURCE)      defined(_NETBSD_SOURCE)
 __BEGIN_DECLS  
 FILE *fmemopen(void * __restrict, size_t, const char * __restrict);  FILE *fmemopen(void * __restrict, size_t, const char * __restrict);
 ssize_t  getdelim(char ** __restrict, size_t * __restrict, int,  
             FILE * __restrict);  
 ssize_t  getline(char ** __restrict, size_t * __restrict, FILE * __restrict);  
 __END_DECLS  
 #endif  #endif
   
 #if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)  #if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)
Line 580  int  vfscanf_l(FILE * __restrict, locale
Line 575  int  vfscanf_l(FILE * __restrict, locale
     __va_list) __scanflike(3, 0);      __va_list) __scanflike(3, 0);
 int      vsscanf_l(const char * __restrict, locale_t, const char * __restrict,  int      vsscanf_l(const char * __restrict, locale_t, const char * __restrict,
     __va_list) __scanflike(3, 0);      __va_list) __scanflike(3, 0);
 #ifdef _NETBSD_SOURCE  
 int     snprintf_ss(char *restrict, size_t, const char * __restrict, ...)  
     __printflike(3, 4);  
 int     vsnprintf_ss(char *restrict, size_t, const char * __restrict, __va_list)  
     __printflike(3, 0);  
 #endif  
 __END_DECLS  __END_DECLS
 #endif  #endif
   
Legend:
Removed from v.1.82.2.2  
changed lines
  Added in v.1.86
CVSweb <webmaster@jp.NetBSD.org>