View | Details | Raw Unified | Return to bug 39238
Collapse All | Expand All

(-)gcc-4_4-branch.orig/libstdc++-v3/include/c_compatibility/fenv.h (-22 / +7 lines)
Lines 26-58 Link Here
26
 *  This is a Standard C++ Library header.
26
 *  This is a Standard C++ Library header.
27
 */
27
 */
28
28
29
#ifndef _GLIBCXX_FENV_H
30
#define _GLIBCXX_FENV_H 1
31
32
#pragma GCC system_header
29
#pragma GCC system_header
33
30
34
#include <bits/c++config.h>
31
#include <bits/c++config.h>
35
#if _GLIBCXX_HAVE_FENV_H
36
# include_next <fenv.h>
37
#endif
38
32
39
#ifdef __GXX_EXPERIMENTAL_CXX0X__
33
#ifdef __GXX_EXPERIMENTAL_CXX0X__
40
#  if defined(_GLIBCXX_INCLUDE_AS_TR1)
34
# include <cfenv>
41
#    error C++0x header cannot be included from TR1 header
35
#else
42
#  endif
36
# if _GLIBCXX_HAVE_FENV_H
43
#  if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
37
#  include_next <fenv.h>
44
#    include <tr1_impl/cfenv>
38
# endif
45
#  else
46
#    define _GLIBCXX_INCLUDE_AS_CXX0X
47
#    define _GLIBCXX_BEGIN_NAMESPACE_TR1
48
#    define _GLIBCXX_END_NAMESPACE_TR1
49
#    define _GLIBCXX_TR1
50
#    include <tr1_impl/cfenv>
51
#    undef _GLIBCXX_TR1
52
#    undef _GLIBCXX_END_NAMESPACE_TR1
53
#    undef _GLIBCXX_BEGIN_NAMESPACE_TR1
54
#    undef _GLIBCXX_INCLUDE_AS_CXX0X
55
#  endif
56
#endif
39
#endif
57
40
41
#ifndef _GLIBCXX_FENV_H
42
#define _GLIBCXX_FENV_H 1
58
#endif // _GLIBCXX_FENV_H
43
#endif // _GLIBCXX_FENV_H
(-)gcc-4_4-branch.orig/libstdc++-v3/include/c_global/cfenv (-3 lines)
Lines 40-48 Link Here
40
#endif
40
#endif
41
41
42
#include <bits/c++config.h>
42
#include <bits/c++config.h>
43
#if _GLIBCXX_HAVE_FENV_H
44
# include <fenv.h>
45
#endif
46
43
47
#if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
44
#if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
48
#  include <tr1_impl/cfenv>
45
#  include <tr1_impl/cfenv>
(-)gcc-4_4-branch.orig/libstdc++-v3/include/tr1/cfenv (-3 lines)
Lines 32-40 Link Here
32
#pragma GCC system_header
32
#pragma GCC system_header
33
33
34
#include <bits/c++config.h>
34
#include <bits/c++config.h>
35
#if _GLIBCXX_HAVE_FENV_H
36
# include <fenv.h>
37
#endif
38
35
39
#if defined(_GLIBCXX_INCLUDE_AS_TR1)
36
#if defined(_GLIBCXX_INCLUDE_AS_TR1)
40
#  include <tr1_impl/cfenv>
37
#  include <tr1_impl/cfenv>
(-)gcc-4_4-branch.orig/libstdc++-v3/include/tr1_impl/cfenv (+2 lines)
Lines 29-34 Link Here
29
29
30
#if _GLIBCXX_USE_C99_FENV_TR1
30
#if _GLIBCXX_USE_C99_FENV_TR1
31
31
32
#include_next <fenv.h>
33
32
#undef feclearexcept
34
#undef feclearexcept
33
#undef fegetexceptflag
35
#undef fegetexceptflag
34
#undef feraiseexcept
36
#undef feraiseexcept

Return to bug 39238