changeset 11:d96a300aed44

6266832 UNIX98/UNIX03: getc(), getchar(), putc(), putchar() did not set stream to byte orientation
author muffin
date Wed, 15 Jun 2005 14:41:40 -0700
parents 8a5e08720433
children 606827e00c98
files usr/src/head/iso/stdio_iso.h
diffstat 1 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/head/iso/stdio_iso.h	Wed Jun 15 13:16:25 2005 -0700
+++ b/usr/src/head/iso/stdio_iso.h	Wed Jun 15 14:41:40 2005 -0700
@@ -19,15 +19,14 @@
  *
  * CDDL HEADER END
  */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-
-/*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
 /*
  * An application should not include this header directly.  Instead it
  * should be included only through the inclusion of other Sun headers.
@@ -332,9 +331,8 @@
 
 #if !defined(__lint)
 
-#ifndef	_REENTRANT
+#if	!defined(_REENTRANT) && !defined(_LP64) && !defined(_STRICT_STDC)
 
-#ifndef	_LP64
 #ifdef	__STDC__
 #if __cplusplus >= 199711L
 namespace std {
@@ -354,7 +352,10 @@
 #define	putc(x, p)	(--(p)->_cnt < 0 ? _flsbuf((x), (p)) : \
 				(int)(*(p)->_ptr++ = (unsigned char) (x)))
 #endif	/* __STDC__ */
-#endif	/* _LP64 */
+
+#endif /* !defined(_REENTRANT) && !defined(_LP64) && !defined(_STRICT_STDC) */
+
+#ifndef	_REENTRANT
 
 #if __cplusplus >= 199711L
 namespace std {