[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.1 and 1.96

version 1.82.2.1, 2013/06/23 06:28:49 version 1.96, 2015/03/24 07:44:52
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 333  int  pclose(FILE *);
Line 330  int  pclose(FILE *);
 FILE    *popen(const char *, const char *);  FILE    *popen(const char *, const char *);
 __END_DECLS  __END_DECLS
 #endif  #endif
   #ifdef _NETBSD_SOURCE
   __BEGIN_DECLS
   FILE    *popenve(const char *, char *const *, char *const *, const char *);
   __END_DECLS
   #endif
   
 /*  /*
  * Functions defined in ISO XPG4.2, ISO C99, POSIX 1003.1-2001 or later.   * Functions defined in ISO XPG4.2, ISO C99, POSIX 1003.1-2001 or later.
Line 368  __END_DECLS
Line 370  __END_DECLS
 /*  /*
  * X/Open CAE Specification Issue 5 Version 2   * X/Open CAE Specification Issue 5 Version 2
  */   */
 #if (_XOPEN_SOURCE - 0) >= 500 || defined(_LARGEFILE_SOURCE) || \  #if (_POSIX_C_SOURCE - 0) >= 200112L || (_XOPEN_SOURCE - 0) >= 500 || \
     defined(_NETBSD_SOURCE)      defined(_NETBSD_SOURCE)
 #ifndef off_t  #ifndef off_t
 typedef __off_t         off_t;  typedef __off_t         off_t;
Line 379  __BEGIN_DECLS
Line 381  __BEGIN_DECLS
 int      fseeko(FILE *, off_t, int);  int      fseeko(FILE *, off_t, int);
 off_t    ftello(FILE *);  off_t    ftello(FILE *);
 __END_DECLS  __END_DECLS
 #endif /* _XOPEN_SOURCE >= 500 || _LARGEFILE_SOURCE || _NETBSD_SOURCE */  #endif /* (_POSIX_C_SOURCE - 0) >= 200112L || _XOPEN_SOURCE >= 500 || ... */
   
 /*  /*
  * Functions defined in ISO C99.  Still put under _NETBSD_SOURCE due to   * Functions defined in ISO C99.  Still put under _NETBSD_SOURCE due to
Line 461  __END_DECLS
Line 463  __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++ = _c);                  return *_p->_p++ = (unsigned char)_c;
         else          else
                 return (__swbuf(_c, _p));                  return __swbuf(_c, _p);
 }  }
 #else  #else
 /*  /*
Line 508  static __inline int __sputc(int _c, FILE
Line 510  static __inline int __sputc(int _c, FILE
 #endif /* !_ANSI_SOURCE && !__cplusplus*/  #endif /* !_ANSI_SOURCE && !__cplusplus*/
   
 #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 || \
Line 525  int  dprintf(int, const char * __restric
Line 529  int  dprintf(int, const char * __restric
   
 #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);
   FILE *open_memstream(char **, size_t *);
   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 570  int  sscanf_l(const char * __restrict, l
Line 580  int  sscanf_l(const char * __restrict, l
     const char * __restrict, ...) __scanflike(3, 4);      const char * __restrict, ...) __scanflike(3, 4);
 int      vscanf_l(locale_t, const char * __restrict, __va_list)  int      vscanf_l(locale_t, const char * __restrict, __va_list)
     __scanflike(2, 0);      __scanflike(2, 0);
 int      vscanf_l(locale_t, const char * __restrict, __va_list)  
     __scanflike(2, 0);  
 int      vfscanf_l(FILE * __restrict, locale_t, const char * __restrict,  int      vfscanf_l(FILE * __restrict, locale_t, const char * __restrict,
     __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,

Legend:
Removed from v.1.82.2.1  
changed lines
  Added in v.1.96

CVSweb <webmaster@jp.NetBSD.org>