===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/stdio.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -c -r1.51 -r1.52
*** src/include/stdio.h	2016/03/14 20:43:03	1.51
--- src/include/stdio.h	2016/03/16 04:56:08	1.52
***************
*** 1,4 ****
! /*	$OpenBSD: stdio.h,v 1.51 2016/03/14 20:43:03 millert Exp $	*/
  /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: stdio.h,v 1.52 2016/03/16 04:56:08 deraadt Exp $	*/
  /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
  
  /*-
***************
*** 393,418 ****
   * define function versions in the C library.
   */
  #define	__sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
- #if defined(__GNUC__)
  static __inline int __sputc(int _c, FILE *_p) {
  	if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
  		return (*_p->_p++ = _c);
  	else
  		return (__swbuf(_c, _p));
  }
- #else
- /*
-  * This has been tuned to generate reasonable code on the vax using pcc.
-  */
- #define	__sputc(c, p) \
- 	(--(p)->_w < 0 ? \
- 		(p)->_w >= (p)->_lbfsize ? \
- 			(*(p)->_p = (c)), *(p)->_p != '\n' ? \
- 				(int)*(p)->_p++ : \
- 				__swbuf('\n', p) : \
- 			__swbuf((int)(c), p) : \
- 		(*(p)->_p = (c), (int)*(p)->_p++))
- #endif
  
  #define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
  #define	__sferror(p)	(((p)->_flags & __SERR) != 0)
--- 393,404 ----