diff -r boost_1_36_beta/boost/math/tr1.hpp boost_1_36_beta_patched/boost/math/tr1.hpp
438c438
< inline long double expm1l(long double x)
---
> inline long double expm1l BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
507c507
< inline long double log1pl(long double x)
---
> inline long double log1pl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
547c547
< inline long double nextafterl(long double x, long double y)
---
> inline long double nextafterl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
diff -r boost_1_36_beta/libs/math/src/tr1/acoshl.cpp boost_1_36_beta_patched/libs/math/src/tr1/acoshl.cpp
11c11
< extern "C" long double BOOST_MATH_TR1_DECL acoshl(long double x)
---
> extern "C" long double BOOST_MATH_TR1_DECL acoshl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
diff -r boost_1_36_beta/libs/math/src/tr1/asinhl.cpp boost_1_36_beta_patched/libs/math/src/tr1/asinhl.cpp
11c11
< extern "C" long double BOOST_MATH_TR1_DECL asinhl(long double x)
---
> extern "C" long double BOOST_MATH_TR1_DECL asinhl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
diff -r boost_1_36_beta/libs/math/src/tr1/atanhl.cpp boost_1_36_beta_patched/libs/math/src/tr1/atanhl.cpp
11c11
< extern "C" long double BOOST_MATH_TR1_DECL atanhl(long double x)
---
> extern "C" long double BOOST_MATH_TR1_DECL atanhl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
diff -r boost_1_36_beta/libs/math/src/tr1/cbrtl.cpp boost_1_36_beta_patched/libs/math/src/tr1/cbrtl.cpp
11c11
< extern "C" long double BOOST_MATH_TR1_DECL cbrtl(long double x)
---
> extern "C" long double BOOST_MATH_TR1_DECL cbrtl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
diff -r boost_1_36_beta/libs/math/src/tr1/copysignl.cpp boost_1_36_beta_patched/libs/math/src/tr1/copysignl.cpp
11c11
< extern "C" long double BOOST_MATH_TR1_DECL copysignl(long double x, long double y)
---
> extern "C" long double BOOST_MATH_TR1_DECL copysignl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
diff -r boost_1_36_beta/libs/math/src/tr1/erfcl.cpp boost_1_36_beta_patched/libs/math/src/tr1/erfcl.cpp
11c11
< extern "C" long double BOOST_MATH_TR1_DECL erfcl(long double x)
---
> extern "C" long double BOOST_MATH_TR1_DECL erfcl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
diff -r boost_1_36_beta/libs/math/src/tr1/erfl.cpp boost_1_36_beta_patched/libs/math/src/tr1/erfl.cpp
11c11
< extern "C" long double BOOST_MATH_TR1_DECL erfl(long double x)
---
> extern "C" long double BOOST_MATH_TR1_DECL erfl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
diff -r boost_1_36_beta/libs/math/src/tr1/fmaxl.cpp boost_1_36_beta_patched/libs/math/src/tr1/fmaxl.cpp
11c11
< extern "C" long double BOOST_MATH_TR1_DECL fmaxl(long double x, long double y)
---
> extern "C" long double BOOST_MATH_TR1_DECL fmaxl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
diff -r boost_1_36_beta/libs/math/src/tr1/fminl.cpp boost_1_36_beta_patched/libs/math/src/tr1/fminl.cpp
11c11
< extern "C" long double BOOST_MATH_TR1_DECL fminl(long double x, long double y)
---
> extern "C" long double BOOST_MATH_TR1_DECL fminl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
diff -r boost_1_36_beta/libs/math/src/tr1/hypotl.cpp boost_1_36_beta_patched/libs/math/src/tr1/hypotl.cpp
13c13
< extern "C" long double BOOST_MATH_TR1_DECL hypotl(long double x, long double y)
---
> extern "C" long double BOOST_MATH_TR1_DECL hypotl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
diff -r boost_1_36_beta/libs/math/src/tr1/lgammal.cpp boost_1_36_beta_patched/libs/math/src/tr1/lgammal.cpp
13c13
< extern "C" long double BOOST_MATH_TR1_DECL lgammal(long double x)
---
> extern "C" long double BOOST_MATH_TR1_DECL lgammal BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
diff -r boost_1_36_beta/libs/math/src/tr1/llroundl.cpp boost_1_36_beta_patched/libs/math/src/tr1/llroundl.cpp
13c13
< extern "C" long long BOOST_MATH_TR1_DECL llroundl(long double x)
---
> extern "C" long long BOOST_MATH_TR1_DECL llroundl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
diff -r boost_1_36_beta/libs/math/src/tr1/lroundl.cpp boost_1_36_beta_patched/libs/math/src/tr1/lroundl.cpp
13c13
< extern "C" long BOOST_MATH_TR1_DECL lroundl(long double x)
---
> extern "C" long BOOST_MATH_TR1_DECL lroundl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
diff -r boost_1_36_beta/libs/math/src/tr1/nexttowardl.cpp boost_1_36_beta_patched/libs/math/src/tr1/nexttowardl.cpp
13c13
< extern "C" long double BOOST_MATH_TR1_DECL nexttowardl(long double x, long double y)
---
> extern "C" long double BOOST_MATH_TR1_DECL nexttowardl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y)
diff -r boost_1_36_beta/libs/math/src/tr1/roundl.cpp boost_1_36_beta_patched/libs/math/src/tr1/roundl.cpp
13c13
< extern "C" long double BOOST_MATH_TR1_DECL roundl(long double x)
---
> extern "C" long double BOOST_MATH_TR1_DECL roundl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
diff -r boost_1_36_beta/libs/math/src/tr1/tgammal.cpp boost_1_36_beta_patched/libs/math/src/tr1/tgammal.cpp
13c13
< extern "C" long double BOOST_MATH_TR1_DECL tgammal(long double x)
---
> extern "C" long double BOOST_MATH_TR1_DECL tgammal BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)
diff -r boost_1_36_beta/libs/math/src/tr1/truncl.cpp boost_1_36_beta_patched/libs/math/src/tr1/truncl.cpp
13c13
< extern "C" long double BOOST_MATH_TR1_DECL truncl(long double x)
---
> extern "C" long double BOOST_MATH_TR1_DECL truncl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x)