about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-12-01 03:20:00 +0000
committerUlrich Drepper <drepper@redhat.com>2000-12-01 03:20:00 +0000
commit38d7adc4e997d0503473938a05364fa752e516f7 (patch)
tree12ddc23832d916a5d474163e566cfeb40faf2969
parent411adb106872a8c52e26ca5f7049d5ec0a4a99dd (diff)
downloadglibc-38d7adc4e997d0503473938a05364fa752e516f7.tar.gz
glibc-38d7adc4e997d0503473938a05364fa752e516f7.tar.xz
glibc-38d7adc4e997d0503473938a05364fa752e516f7.zip
Update.
2000-11-28  H.J. Lu  <hjl@gnu.org>

	* libio/libio.h: Remove extra "#if ... #endif".
-rw-r--r--ChangeLog4
-rw-r--r--libio/libio.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index aefe8bcbf2..232248eaeb 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 edf52401f3..631815c850 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