summaryrefslogtreecommitdiff
path: root/usr/src/head
diff options
context:
space:
mode:
authormuffin <none@none>2005-06-15 14:41:40 -0700
committermuffin <none@none>2005-06-15 14:41:40 -0700
commit50b37527dc4b5fb2b4b3c301dedc1f3b65e254ac (patch)
tree176d826ee293cd024ed5f502309d7a313739a696 /usr/src/head
parent7c035692432ca74d4d930a4e85c6fc6940393f21 (diff)
downloadillumos-joyent-50b37527dc4b5fb2b4b3c301dedc1f3b65e254ac.tar.gz
6266832 UNIX98/UNIX03: getc(), getchar(), putc(), putchar() did not set stream to byte orientation
Diffstat (limited to 'usr/src/head')
-rw-r--r--usr/src/head/iso/stdio_iso.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/usr/src/head/iso/stdio_iso.h b/usr/src/head/iso/stdio_iso.h
index 0ab2ff0927..e2272c51df 100644
--- a/usr/src/head/iso/stdio_iso.h
+++ b/usr/src/head/iso/stdio_iso.h
@@ -19,15 +19,14 @@
*
* CDDL HEADER END
*/
-/* Copyright (c) 1988 AT&T */
-/* All Rights Reserved */
-
-
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
+/* Copyright (c) 1988 AT&T */
+/* All Rights Reserved */
+
/*
* 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 @@ extern int _flsbuf();
#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 @@ inline int putc(int _x, FILE *_p) {
#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 {