From ddc9c40d207ed67a7c438b4bd3166eeaa44dd08a Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 27 Jul 2010 10:36:50 +0000 Subject: acinclude.m4 ([GLIBCXX_CHECK_STDIO_MACROS]): Remove. 2010-07-27 Paolo Carlini Ralf Wildenhues * acinclude.m4 ([GLIBCXX_CHECK_STDIO_MACROS]): Remove. ([GLIBCXX_COMPUTE_STDIO_INTEGER_CONSTANTS]): Add, actually compute the constants via AC_COMPUTE_INT. * configure.ac: Call the latter. * include/bits/ios_base.h: Adjust. * include/bits/char_traits.h: Likewise. * testsuite/27_io/ios_base/cons/assign_neg.cc: Adjust dg-error line number. * testsuite/27_io/ios_base/cons/copy_neg.cc: Likewise. * config.h.in: Regenerate. * configure: Likewise. 2010-07-27 Paolo Carlini * config/io/c_io_stdio.h: Do not include . Co-Authored-By: Ralf Wildenhues From-SVN: r162562 --- libstdc++-v3/include/bits/ios_base.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'libstdc++-v3/include/bits/ios_base.h') diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h index 0ac3d692647..6515dd40e8e 100644 --- a/libstdc++-v3/include/bits/ios_base.h +++ b/libstdc++-v3/include/bits/ios_base.h @@ -42,15 +42,6 @@ #include #include -#ifndef _GLIBCXX_STDIO_MACROS -# include // For SEEK_CUR, SEEK_END -# define _IOS_BASE_SEEK_CUR SEEK_CUR -# define _IOS_BASE_SEEK_END SEEK_END -#else -# define _IOS_BASE_SEEK_CUR 1 -# define _IOS_BASE_SEEK_END 2 -#endif - _GLIBCXX_BEGIN_NAMESPACE(std) // The following definitions of bitmask types are enums, not ints, @@ -189,8 +180,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) enum _Ios_Seekdir { _S_beg = 0, - _S_cur = _IOS_BASE_SEEK_CUR, - _S_end = _IOS_BASE_SEEK_END, + _S_cur = _GLIBCXX_STDIO_SEEK_CUR, + _S_end = _GLIBCXX_STDIO_SEEK_END, _S_ios_seekdir_end = 1L << 16 }; @@ -970,8 +961,5 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#undef _IOS_BASE_SEEK_CUR -#undef _IOS_BASE_SEEK_END - #endif /* _IOS_BASE_H */ -- cgit v1.2.1