Print this page
Fix clang errors
Used Albert's patch to stdio_iso.h
Formatting issues
3781 gcc4.7 __cplusplus change incompatibility

Split Close
Expand all
Collapse all
          --- old/usr/src/head/iso/stdio_iso.h
          +++ new/usr/src/head/iso/stdio_iso.h
↓ open down ↓ 38 lines elided ↑ open up ↑
  39   39   * must also be added to <stdio.h>.
  40   40   */
  41   41  
  42   42  /*
  43   43   * User-visible pieces of the ANSI C standard I/O package.
  44   44   */
  45   45  
  46   46  #ifndef _ISO_STDIO_ISO_H
  47   47  #define _ISO_STDIO_ISO_H
  48   48  
  49      -#pragma ident   "%Z%%M% %I%     %E% SMI"
  50      -
  51   49  #include <sys/feature_tests.h>
  52   50  #include <sys/va_list.h>
  53   51  #include <stdio_tag.h>
  54   52  #include <stdio_impl.h>
  55   53  
  56   54  /*
  57   55   * If feature test macros are set that enable interfaces that use types
  58   56   * defined in <sys/types.h>, get those types by doing the include.
  59   57   *
  60   58   * Note that in asking for the interfaces associated with this feature test
↓ open down ↓ 263 lines elided ↑ open up ↑
 324  322  #endif  /*      _LP64   */
 325  323  
 326  324  #endif  /* __STDC__ */
 327  325  
 328  326  #if __cplusplus >= 199711L
 329  327  }
 330  328  #endif /* end of namespace std */
 331  329  
 332  330  #if !defined(__lint)
 333  331  
 334      -#if     !defined(_REENTRANT) && !defined(_LP64) && !defined(_STRICT_STDC)
      332 +#if     !defined(_REENTRANT) && !defined(_LP64)
 335  333  
 336  334  #ifdef  __STDC__
 337  335  #if __cplusplus >= 199711L
 338  336  namespace std {
 339  337  inline int getc(FILE *_p) {
 340  338          return (--_p->_cnt < 0 ? __filbuf(_p) : (int)*_p->_ptr++); }
 341  339  inline int putc(int _x, FILE *_p) {
 342  340          return (--_p->_cnt < 0 ? __flsbuf(_x, _p)
 343  341                  : (int)(*_p->_ptr++ = (unsigned char) _x)); }
 344  342  }
↓ open down ↓ 1 lines elided ↑ open up ↑
 346  344  #define getc(p)         (--(p)->_cnt < 0 ? __filbuf(p) : (int)*(p)->_ptr++)
 347  345  #define putc(x, p)      (--(p)->_cnt < 0 ? __flsbuf((x), (p)) \
 348  346                                  : (int)(*(p)->_ptr++ = (unsigned char) (x)))
 349  347  #endif /* __cplusplus >= 199711L */
 350  348  #else /* __STDC__ */
 351  349  #define getc(p)         (--(p)->_cnt < 0 ? _filbuf(p) : (int)*(p)->_ptr++)
 352  350  #define putc(x, p)      (--(p)->_cnt < 0 ? _flsbuf((x), (p)) : \
 353  351                                  (int)(*(p)->_ptr++ = (unsigned char) (x)))
 354  352  #endif  /* __STDC__ */
 355  353  
 356      -#endif /* !defined(_REENTRANT) && !defined(_LP64) && !defined(_STRICT_STDC) */
      354 +#endif /* !defined(_REENTRANT) && !defined(_LP64) */
 357  355  
 358  356  #ifndef _REENTRANT
 359  357  
 360  358  #if __cplusplus >= 199711L
 361  359  namespace std {
 362  360  inline int getchar() { return getc(stdin); }
 363  361  inline int putchar(int _x) { return putc(_x, stdout); }
 364  362  }
 365  363  #else
 366  364  #define getchar()       getc(stdin)
↓ open down ↓ 26 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX