From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 1 Dec 2000 03:20:00 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.20~17070
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38d7adc4e997d0503473938a05364fa752e516f7;p=platform%2Fupstream%2Flinaro-glibc.git

Update.

2000-11-28  H.J. Lu  <hjl@gnu.org>

	* libio/libio.h: Remove extra "#if ... #endif".
---

diff --git a/ChangeLog b/ChangeLog
index aefe8bc..232248e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-28  H.J. Lu  <hjl@gnu.org>
+
+	* libio/libio.h: Remove extra "#if ... #endif".
+
 2000-11-29  H.J. Lu  <hjl@gnu.org>
 
 	* stdio-common/vfscanf.c (ORIENT): Swap the COMPILE_WSCANF case.
diff --git a/libio/libio.h b/libio/libio.h
index edf5240..631815c 100644
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -246,17 +246,13 @@ struct _IO_wide_data
 				   backup area */
   wchar_t *_IO_save_end;	/* Pointer to end of non-current get area. */
 
-#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
   __mbstate_t _IO_state;
   __mbstate_t _IO_last_state;
-#endif
   struct _IO_codecvt _codecvt;
 
   wchar_t _shortbuf[1];
 
-#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
   struct _IO_jump_t *_wide_vtable;
-#endif
 };
 #endif