about summary refs log tree commit diff
path: root/libio/libio.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-07-09 15:27:41 +0000
committerUlrich Drepper <drepper@redhat.com>1998-07-09 15:27:41 +0000
commitbfcd44c39909d7542ed8b95529829ffcfb569918 (patch)
tree824f8a64459bb9b11817ae7994e04731043bb291 /libio/libio.h
parente918a7feebf850a139d894db559f0bd5b5fec32d (diff)
downloadglibc-bfcd44c39909d7542ed8b95529829ffcfb569918.tar.gz
glibc-bfcd44c39909d7542ed8b95529829ffcfb569918.tar.xz
glibc-bfcd44c39909d7542ed8b95529829ffcfb569918.zip
Update.
1998-07-09  Ulrich Drepper  <drepper@cygnus.com>

	* posix/unistd.h: Simplify #ifdefs.

	* libio/libio.h: Undo last change due to possible C++ problems.
	* libio/fileops.h: Likewise.
Diffstat (limited to 'libio/libio.h')
-rw-r--r--libio/libio.h18
1 files changed, 2 insertions, 16 deletions
diff --git a/libio/libio.h b/libio/libio.h
index 410794f77c..a060b42395 100644
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -286,24 +286,10 @@ extern int __overflow __P ((_IO_FILE *, int));
        ((_fp)->_IO_read_ptr >= (_fp)->_IO_read_end \
 	  && __underflow (_fp) == EOF ? EOF \
 	: *(unsigned char *) (_fp)->_IO_read_ptr)
-
-#ifdef __GNUC__
-# define _IO_putc_unlocked(_ch, _fp) \
-  (__extension__ \
-   ({ unsigned char _chl = (_ch); \
-      (((_fp)->_IO_write_ptr >= (_fp)->_IO_write_end \
-	|| (_chl == '\n' && ((_fp)->_flags & _IO_LINE_BUF))) \
-       ? __overflow (_fp, (unsigned char) _chl) \
-       : (unsigned char) (*(_fp)->_IO_write_ptr++ = _chl)); }))
-#else
-# define _IO_putc_unlocked(_ch, _fp) \
+#define _IO_putc_unlocked(_ch, _fp) \
    (((_fp)->_IO_write_ptr >= (_fp)->_IO_write_end) \
     ? __overflow (_fp, (unsigned char) (_ch)) \
-    : ((unsigned char) (*(_fp)->_IO_write_ptr = (_ch)) == '\n' \
-       && ((_fp)->_flags & _IO_LINE_BUF) \
-       ? __overflow (_fp, (unsigned char) *(_fp)->_IO_write_ptr) \
-       : (unsigned char) (*(_fp)->_IO_write_ptr++)))
-#endif
+    : (unsigned char) (*(_fp)->_IO_write_ptr++ = (_ch)))
 
 #define _IO_feof_unlocked(__fp) (((__fp)->_flags & _IO_EOF_SEEN) != 0)
 #define _IO_ferror_unlocked(__fp) (((__fp)->_flags & _IO_ERR_SEEN) != 0)