From 10191d82c22cdc4ab0872b7b4d88a7801ecb2758 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 15 Oct 2014 11:29:04 +0200 Subject: [PATCH] Revert "Temporary build fix for OpenEXR." This reverts commit 1431a56f3371270f08d20ca2e46a28418ac7ecd9. This has been fixed in a better way in the gcc2 package. --- src/add-ons/translators/exr/openexr/imath/ImathLimits.h | 4 ---- src/add-ons/translators/exr/openexr/imath/Jamfile | 1 - src/add-ons/translators/exr/openexr/imath/gcc2fix.c | 3 --- 3 files changed, 8 deletions(-) delete mode 100644 src/add-ons/translators/exr/openexr/imath/gcc2fix.c diff --git a/src/add-ons/translators/exr/openexr/imath/ImathLimits.h b/src/add-ons/translators/exr/openexr/imath/ImathLimits.h index ab2e9f59c5..683e990c0a 100644 --- a/src/add-ons/translators/exr/openexr/imath/ImathLimits.h +++ b/src/add-ons/translators/exr/openexr/imath/ImathLimits.h @@ -46,10 +46,6 @@ #include #undef LDBL_EPSILON #define LDBL_EPSILON 2.2204460492503131e-16L -#undef LDBL_MAX -#undef LDBL_MIN -extern "C" long double LDBL_MAX; -extern "C" long double LDBL_MIN; #include //------------------------------------------ diff --git a/src/add-ons/translators/exr/openexr/imath/Jamfile b/src/add-ons/translators/exr/openexr/imath/Jamfile index 1480d422a0..3ae13ada58 100644 --- a/src/add-ons/translators/exr/openexr/imath/Jamfile +++ b/src/add-ons/translators/exr/openexr/imath/Jamfile @@ -19,7 +19,6 @@ for architectureObject in [ MultiArchSubDirSetup ] { ImathRandom.cpp ImathShear.cpp ImathVec.cpp - gcc2fix.c ; } } diff --git a/src/add-ons/translators/exr/openexr/imath/gcc2fix.c b/src/add-ons/translators/exr/openexr/imath/gcc2fix.c deleted file mode 100644 index 1345b67efe..0000000000 --- a/src/add-ons/translators/exr/openexr/imath/gcc2fix.c +++ /dev/null @@ -1,3 +0,0 @@ -// C++ doesn't handle hex floats properly... -long double LDBL_MAX = 0xfffffffffffffffp16320l; -long double LDBL_MIN = 0x1p-16382l;