diff options
Diffstat (limited to 'libstdc++-v3/include/c_std')
-rw-r--r-- | libstdc++-v3/include/c_std/cmath.tcc | 8 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_cctype.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_cerrno.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_cfloat.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_climits.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_clocale.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_cmath.h | 9 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_csetjmp.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_csignal.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_cstdarg.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_cstddef.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_cstdio.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_cstdlib.h | 8 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_cstring.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_ctime.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_cwchar.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/c_std/std_cwctype.h | 4 |
17 files changed, 42 insertions, 39 deletions
diff --git a/libstdc++-v3/include/c_std/cmath.tcc b/libstdc++-v3/include/c_std/cmath.tcc index be7502d3c46..a7bdf227b11 100644 --- a/libstdc++-v3/include/c_std/cmath.tcc +++ b/libstdc++-v3/include/c_std/cmath.tcc @@ -1,6 +1,6 @@ // -*- C++ -*- C math library. -// Copyright (C) 2000 Free Software Foundation, Inc. +// Copyright (C) 2000, 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 @@ -29,12 +29,12 @@ // This file was written by Gabriel Dos Reis <gdr@codesourcery.com> -#ifndef _CMATH_TCC -#define _CMATH_TCC 1 +#ifndef _GLIBCXX_CMATH_TCC +#define _GLIBCXX_CMATH_TCC 1 namespace std { - export template<typename _Tp> + template<typename _Tp> _Tp __cmath_power(_Tp __x, unsigned int __n) { diff --git a/libstdc++-v3/include/c_std/std_cctype.h b/libstdc++-v3/include/c_std/std_cctype.h index 8b903eaf76a..02978622d82 100644 --- a/libstdc++-v3/include/c_std/std_cctype.h +++ b/libstdc++-v3/include/c_std/std_cctype.h @@ -40,8 +40,8 @@ * contained in the namespace @c std. */ -#ifndef _CCTYPE -#define _CCTYPE 1 +#ifndef _GLIBCXX_CCTYPE +#define _GLIBCXX_CCTYPE 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cerrno.h b/libstdc++-v3/include/c_std/std_cerrno.h index b9a0743e79a..7915e14ba27 100644 --- a/libstdc++-v3/include/c_std/std_cerrno.h +++ b/libstdc++-v3/include/c_std/std_cerrno.h @@ -40,8 +40,8 @@ * contained in the namespace @c std. */ -#ifndef _CERRNO -#define _CERRNO 1 +#ifndef _GLIBCXX_CERRNO +#define _GLIBCXX_CERRNO 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cfloat.h b/libstdc++-v3/include/c_std/std_cfloat.h index ab7283e7802..4c5bb00f204 100644 --- a/libstdc++-v3/include/c_std/std_cfloat.h +++ b/libstdc++-v3/include/c_std/std_cfloat.h @@ -40,8 +40,8 @@ * contained in the namespace @c std. */ -#ifndef _CFLOAT -#define _CFLOAT 1 +#ifndef _GLIBCXX_CFLOAT +#define _GLIBCXX_CFLOAT 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_climits.h b/libstdc++-v3/include/c_std/std_climits.h index 7f2b0125f23..f4e1d8f77fa 100644 --- a/libstdc++-v3/include/c_std/std_climits.h +++ b/libstdc++-v3/include/c_std/std_climits.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CLIMITS -#define _CLIMITS 1 +#ifndef _GLIBCXX_CLIMITS +#define _GLIBCXX_CLIMITS 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_clocale.h b/libstdc++-v3/include/c_std/std_clocale.h index c6a882b6fe1..988b84924af 100644 --- a/libstdc++-v3/include/c_std/std_clocale.h +++ b/libstdc++-v3/include/c_std/std_clocale.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CLOCALE -#define _CLOCALE 1 +#ifndef _GLIBCXX_CLOCALE +#define _GLIBCXX_CLOCALE 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cmath.h b/libstdc++-v3/include/c_std/std_cmath.h index b34e172167c..7edf7581f55 100644 --- a/libstdc++-v3/include/c_std/std_cmath.h +++ b/libstdc++-v3/include/c_std/std_cmath.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CMATH -#define _CMATH 1 +#ifndef _GLIBCXX_CMATH +#define _GLIBCXX_CMATH 1 #pragma GCC system_header @@ -838,9 +838,8 @@ namespace std #endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */ #endif -#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT -# define export -# include <bits/cmath.tcc> +#ifndef _GLIBCXX_EXPORT_TEMPLATE +# include <bits/cmath.tcc> #endif #endif diff --git a/libstdc++-v3/include/c_std/std_csetjmp.h b/libstdc++-v3/include/c_std/std_csetjmp.h index c5b9119e0b8..d5fe073f0fc 100644 --- a/libstdc++-v3/include/c_std/std_csetjmp.h +++ b/libstdc++-v3/include/c_std/std_csetjmp.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CSETJMP -#define _CSETJMP 1 +#ifndef _GLIBCXX_CSETJMP +#define _GLIBCXX_CSETJMP 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_csignal.h b/libstdc++-v3/include/c_std/std_csignal.h index 8be03f05f4c..5734cf6d29a 100644 --- a/libstdc++-v3/include/c_std/std_csignal.h +++ b/libstdc++-v3/include/c_std/std_csignal.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CSIGNAL -#define _CSIGNAL 1 +#ifndef _GLIBCXX_CSIGNAL +#define _GLIBCXX_CSIGNAL 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cstdarg.h b/libstdc++-v3/include/c_std/std_cstdarg.h index 52979dffa6c..ca362e4b412 100644 --- a/libstdc++-v3/include/c_std/std_cstdarg.h +++ b/libstdc++-v3/include/c_std/std_cstdarg.h @@ -40,8 +40,8 @@ * contained in the namespace @c std. */ -#ifndef _CSTDARG -#define _CSTDARG 1 +#ifndef _GLIBCXX_CSTDARG +#define _GLIBCXX_CSTDARG 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cstddef.h b/libstdc++-v3/include/c_std/std_cstddef.h index b7e56100196..a171c5a9765 100644 --- a/libstdc++-v3/include/c_std/std_cstddef.h +++ b/libstdc++-v3/include/c_std/std_cstddef.h @@ -40,8 +40,8 @@ * contained in the namespace @c std. */ -#ifndef _CSTDDEF -#define _CSTDDEF 1 +#ifndef _GLIBCXX_CSTDDEF +#define _GLIBCXX_CSTDDEF 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cstdio.h b/libstdc++-v3/include/c_std/std_cstdio.h index 732da5f9461..331dc15b0f7 100644 --- a/libstdc++-v3/include/c_std/std_cstdio.h +++ b/libstdc++-v3/include/c_std/std_cstdio.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CSTDIO -#define _CSTDIO 1 +#ifndef _GLIBCXX_CSTDIO +#define _GLIBCXX_CSTDIO 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cstdlib.h b/libstdc++-v3/include/c_std/std_cstdlib.h index 5cac120edfd..14b3b909086 100644 --- a/libstdc++-v3/include/c_std/std_cstdlib.h +++ b/libstdc++-v3/include/c_std/std_cstdlib.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CSTDLIB -#define _CSTDLIB 1 +#ifndef _GLIBCXX_CSTDLIB +#define _GLIBCXX_CSTDLIB 1 #pragma GCC system_header @@ -101,9 +101,11 @@ namespace std using ::labs; using ::ldiv; using ::malloc; +#ifdef _GLIBCXX_HAVE_MBSTATE_T using ::mblen; using ::mbstowcs; using ::mbtowc; +#endif // _GLIBCXX_HAVE_MBSTATE_T using ::qsort; using ::rand; using ::realloc; @@ -112,8 +114,10 @@ namespace std using ::strtol; using ::strtoul; using ::system; +#ifdef _GLIBCXX_USE_WCHAR_T using ::wcstombs; using ::wctomb; +#endif // _GLIBCXX_USE_WCHAR_T inline long abs(long __i) { return labs(__i); } diff --git a/libstdc++-v3/include/c_std/std_cstring.h b/libstdc++-v3/include/c_std/std_cstring.h index 934e491def6..4436db69240 100644 --- a/libstdc++-v3/include/c_std/std_cstring.h +++ b/libstdc++-v3/include/c_std/std_cstring.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CSTRING -#define _CSTRING 1 +#ifndef _GLIBCXX_CSTRING +#define _GLIBCXX_CSTRING 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_ctime.h b/libstdc++-v3/include/c_std/std_ctime.h index b7ed90698a2..fe890dfd580 100644 --- a/libstdc++-v3/include/c_std/std_ctime.h +++ b/libstdc++-v3/include/c_std/std_ctime.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CTIME -#define _CTIME 1 +#ifndef _GLIBCXX_CTIME +#define _GLIBCXX_CTIME 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cwchar.h b/libstdc++-v3/include/c_std/std_cwchar.h index b9e0965ce8e..8a20a712862 100644 --- a/libstdc++-v3/include/c_std/std_cwchar.h +++ b/libstdc++-v3/include/c_std/std_cwchar.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CWCHAR -#define _CWCHAR 1 +#ifndef _GLIBCXX_CWCHAR +#define _GLIBCXX_CWCHAR 1 #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/std_cwctype.h b/libstdc++-v3/include/c_std/std_cwctype.h index f7639ed3843..fbd2eabdbcd 100644 --- a/libstdc++-v3/include/c_std/std_cwctype.h +++ b/libstdc++-v3/include/c_std/std_cwctype.h @@ -41,8 +41,8 @@ * contained in the namespace @c std. */ -#ifndef _CWCTYPE -#define _CWCTYPE 1 +#ifndef _GLIBCXX_CWCTYPE +#define _GLIBCXX_CWCTYPE 1 #pragma GCC system_header |