diff options
Diffstat (limited to 'contrib/libstdc++/include/c_compatibility')
17 files changed, 54 insertions, 46 deletions
diff --git a/contrib/libstdc++/include/c_compatibility/ctype.h b/contrib/libstdc++/include/c_compatibility/ctype.h index 1989347e2d86b..3a610d1777b17 100644 --- a/contrib/libstdc++/include/c_compatibility/ctype.h +++ b/contrib/libstdc++/include/c_compatibility/ctype.h @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_CTYPE_H_ -#define _CPP_CTYPE_H_ 1 +#ifndef _GLIBCXX_CTYPE_H +#define _GLIBCXX_CTYPE_H 1 #include <cctype> diff --git a/contrib/libstdc++/include/c_compatibility/errno.h b/contrib/libstdc++/include/c_compatibility/errno.h index f890b53754952..f6b2b76868016 100644 --- a/contrib/libstdc++/include/c_compatibility/errno.h +++ b/contrib/libstdc++/include/c_compatibility/errno.h @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_ERRNO_H_ -#define _CPP_ERRNO_H_ 1 +#ifndef _GLIBCXX_ERRNO_H +#define _GLIBCXX_ERRNO_H 1 #include <cerrno> diff --git a/contrib/libstdc++/include/c_compatibility/float.h b/contrib/libstdc++/include/c_compatibility/float.h index 7d7b9d44f9ff0..5eaaba6e593f8 100644 --- a/contrib/libstdc++/include/c_compatibility/float.h +++ b/contrib/libstdc++/include/c_compatibility/float.h @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_FLOAT_H_ -#define _CPP_FLOAT_H_ 1 +#ifndef _GLIBCXX_FLOAT_H +#define _GLIBCXX_FLOAT_H 1 #include <cfloat> diff --git a/contrib/libstdc++/include/c_compatibility/iso646.h b/contrib/libstdc++/include/c_compatibility/iso646.h index 25b6140ba53c8..83c536431f758 100644 --- a/contrib/libstdc++/include/c_compatibility/iso646.h +++ b/contrib/libstdc++/include/c_compatibility/iso646.h @@ -27,9 +27,9 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_ISO646_H_ -#define _CPP_ISO646_H_ 1 +#ifndef _GLIBCXX_ISO646_H +#define _GLIBCXX_ISO646_H 1 #include <ciso646> -#endif +#endif diff --git a/contrib/libstdc++/include/c_compatibility/limits.h b/contrib/libstdc++/include/c_compatibility/limits.h index 9ddbce8990e92..d9a753c1c6e37 100644 --- a/contrib/libstdc++/include/c_compatibility/limits.h +++ b/contrib/libstdc++/include/c_compatibility/limits.h @@ -27,9 +27,9 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_LIMITS_H_ -#define _CPP_LIMITS_H_ 1 +#ifndef _GLIBCXX_LIMITS_H +#define _GLIBCXX_LIMITS_H 1 #include <climits> -#endif +#endif diff --git a/contrib/libstdc++/include/c_compatibility/locale.h b/contrib/libstdc++/include/c_compatibility/locale.h index 4d7d72da7ab4f..549bd7d5ea384 100644 --- a/contrib/libstdc++/include/c_compatibility/locale.h +++ b/contrib/libstdc++/include/c_compatibility/locale.h @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_LOCALE_H_ -#define _CPP_LOCALE_H_ 1 +#ifndef _GLIBCXX_LOCALE_H +#define _GLIBCXX_LOCALE_H 1 #include <clocale> @@ -36,4 +36,4 @@ using std::lconv; using std::setlocale; using std::localeconv; -#endif +#endif diff --git a/contrib/libstdc++/include/c_compatibility/math.h b/contrib/libstdc++/include/c_compatibility/math.h index 4c4fd0a21781c..1cd48cf45db6e 100644 --- a/contrib/libstdc++/include/c_compatibility/math.h +++ b/contrib/libstdc++/include/c_compatibility/math.h @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_MATH_H_ -#define _CPP_MATH_H_ 1 +#ifndef _GLIBCXX_MATH_H +#define _GLIBCXX_MATH_H 1 #include <cmath> @@ -56,7 +56,7 @@ using std::fabs; using std::floor; using std::fmod; -#if _GLIBCPP_USE_C99 +#if _GLIBCXX_USE_C99 using std::fpclassify; using std::isfinite; using std::isinf; diff --git a/contrib/libstdc++/include/c_compatibility/setjmp.h b/contrib/libstdc++/include/c_compatibility/setjmp.h index f194253f8689c..0bcad031867e3 100644 --- a/contrib/libstdc++/include/c_compatibility/setjmp.h +++ b/contrib/libstdc++/include/c_compatibility/setjmp.h @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_SETJMP_H_ -#define _CPP_SETJMP_H_ 1 +#ifndef _GLIBCXX_SETJMP_H +#define _GLIBCXX_SETJMP_H 1 #include <csetjmp> diff --git a/contrib/libstdc++/include/c_compatibility/signal.h b/contrib/libstdc++/include/c_compatibility/signal.h index 724ac8a1d665b..b43deb5968a15 100644 --- a/contrib/libstdc++/include/c_compatibility/signal.h +++ b/contrib/libstdc++/include/c_compatibility/signal.h @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_SIGNAL_H_ -#define _CPP_SIGNAL_H_ 1 +#ifndef _GLIBCXX_SIGNAL_H +#define _GLIBCXX_SIGNAL_H 1 #include <csignal> diff --git a/contrib/libstdc++/include/c_compatibility/stdarg.h b/contrib/libstdc++/include/c_compatibility/stdarg.h index a1a62b1699e79..76d6c74b2a2e9 100644 --- a/contrib/libstdc++/include/c_compatibility/stdarg.h +++ b/contrib/libstdc++/include/c_compatibility/stdarg.h @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_STDARG_H_ -#define _CPP_STDARG_H_ 1 +#ifndef _GLIBCXX_STDARG_H +#define _GLIBCXX_STDARG_H 1 #include <cstdarg> diff --git a/contrib/libstdc++/include/c_compatibility/stddef.h b/contrib/libstdc++/include/c_compatibility/stddef.h index 094c380ad02c4..4dac7db2989b3 100644 --- a/contrib/libstdc++/include/c_compatibility/stddef.h +++ b/contrib/libstdc++/include/c_compatibility/stddef.h @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_STDDEF_H_ -#define _CPP_STDDEF_H_ 1 +#ifndef _GLIBCXX_STDDEF_H +#define _GLIBCXX_STDDEF_H 1 #include <cstddef> diff --git a/contrib/libstdc++/include/c_compatibility/stdio.h b/contrib/libstdc++/include/c_compatibility/stdio.h index 930ffd4861db1..2686a728035d2 100644 --- a/contrib/libstdc++/include/c_compatibility/stdio.h +++ b/contrib/libstdc++/include/c_compatibility/stdio.h @@ -27,13 +27,13 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_STDIO_H_ -#define _CPP_STDIO_H_ 1 +#ifndef _GLIBCXX_STDIO_H +#define _GLIBCXX_STDIO_H 1 #include <cstdio> using std::FILE; -using std::fpos_t; +using std::fpos_t; using std::remove; using std::rename; diff --git a/contrib/libstdc++/include/c_compatibility/stdlib.h b/contrib/libstdc++/include/c_compatibility/stdlib.h index d516034d9d78d..2b05c1a3b442a 100644 --- a/contrib/libstdc++/include/c_compatibility/stdlib.h +++ b/contrib/libstdc++/include/c_compatibility/stdlib.h @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_STDLIB_H_ -#define _CPP_STDLIB_H_ 1 +#ifndef _GLIBCXX_STDLIB_H +#define _GLIBCXX_STDLIB_H 1 #include <cstdlib> diff --git a/contrib/libstdc++/include/c_compatibility/string.h b/contrib/libstdc++/include/c_compatibility/string.h index b639157ee5934..a399f60b34bf1 100644 --- a/contrib/libstdc++/include/c_compatibility/string.h +++ b/contrib/libstdc++/include/c_compatibility/string.h @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_STRING_H_ -#define _CPP_STRING_H_ 1 +#ifndef _GLIBCXX_STRING_H +#define _GLIBCXX_STRING_H 1 #include <cstring> @@ -55,4 +55,4 @@ using std::memset; using std::strerror; using std::strlen; -#endif +#endif diff --git a/contrib/libstdc++/include/c_compatibility/time.h b/contrib/libstdc++/include/c_compatibility/time.h index 6d07aa1aed614..0e7e2ad917b5d 100644 --- a/contrib/libstdc++/include/c_compatibility/time.h +++ b/contrib/libstdc++/include/c_compatibility/time.h @@ -27,11 +27,11 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_TIME_H_ -#define _CPP_TIME_H_ 1 +#ifndef _GLIBCXX_TIME_H +#define _GLIBCXX_TIME_H 1 #include <ctime> - + // Get rid of those macros defined in <time.h> in lieu of real functions. #undef clock #undef difftime diff --git a/contrib/libstdc++/include/c_compatibility/wchar.h b/contrib/libstdc++/include/c_compatibility/wchar.h index e9485a54ded4d..a962ff2ffb951 100644 --- a/contrib/libstdc++/include/c_compatibility/wchar.h +++ b/contrib/libstdc++/include/c_compatibility/wchar.h @@ -1,6 +1,6 @@ // -*- C++ -*- compatibility header. -// Copyright (C) 2002 Free Software Foundation, Inc. +// Copyright (C) 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -27,14 +27,14 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_WCHAR_H_ -#define _CPP_WCHAR_H_ 1 +#ifndef _GLIBCXX_WCHAR_H +#define _GLIBCXX_WCHAR_H 1 #include <cwchar> using std::mbstate_t; -#if _GLIBCPP_USE_WCHAR_T +#if _GLIBCXX_USE_WCHAR_T using std::wint_t; using std::btowc; @@ -50,11 +50,17 @@ using std::fwscanf; using std::swprintf; using std::swscanf; using std::vfwprintf; +#if _GLIBCXX_HAVE_VFWSCANF using std::vfwscanf; +#endif using std::vswprintf; +#if _GLIBCXX_HAVE_VSWSCANF using std::vswscanf; +#endif using std::vwprintf; +#if _GLIBCXX_HAVE_VWSCANF using std::vwscanf; +#endif using std::wprintf; using std::wscanf; using std::getwc; @@ -69,7 +75,9 @@ using std::putwchar; using std::ungetwc; using std::wcrtomb; using std::wcstod; +#if _GLIBCXX_HAVE_WCSTOF using std::wcstof; +#endif using std::wcstol; using std::wcstoul; using std::wcscpy; @@ -95,12 +103,12 @@ using std::wmemmove; using std::wmemset; using std::wcsftime; -#if _GLIBCPP_USE_C99 +#if _GLIBCXX_USE_C99 using std::wcstold; using std::wcstoll; using std::wcstoull; #endif -#endif //_GLIBCPP_USE_WCHAR_T +#endif //_GLIBCXX_USE_WCHAR_T #endif diff --git a/contrib/libstdc++/include/c_compatibility/wctype.h b/contrib/libstdc++/include/c_compatibility/wctype.h index 2c75ec8e960b6..6086f3d62353e 100644 --- a/contrib/libstdc++/include/c_compatibility/wctype.h +++ b/contrib/libstdc++/include/c_compatibility/wctype.h @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _CPP_CWCTYPE_H_ -#define _CPP_CWCTYPE_H_ 1 +#ifndef _GLIBCXX_CWCTYPE_H +#define _GLIBCXX_CWCTYPE_H 1 #include <cwctype> @@ -52,4 +52,4 @@ using std::towupper; using std::wctrans; using std::wctype; -#endif +#endif |