[lmi-commits] [lmi] master 50b2645a 08/13: Use fdlibm header

[Greg Chicares]

branch: master
commit 50b2645a43e1c0fd84d0682186bcbba0a231cb9a
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Use fdlibm header
---
 fdlibm_expm1.c | 40 +---------------------------------------
 fdlibm_log1p.c | 40 +---------------------------------------
 2 files changed, 2 insertions(+), 78 deletions(-)

diff --git a/fdlibm_expm1.c b/fdlibm_expm1.c
index a2c2f3d9..5ed45732 100644
--- a/fdlibm_expm1.c
+++ b/fdlibm_expm1.c
@@ -25,10 +25,7 @@
 // Adapted for lmi by GWC; any defects introduced should not reflect
 // on the reputations of the original authors.
 
-// Generally, lmi '.cpp' files include at least one lmi '.hpp' file,
-// which includes 'config.hpp'. Include 'version.hpp' here because
-// it's the simplest lmi header.
-#include "version.hpp"
+#include "fdlibm.hpp"
 
 #include <stdint.h>
 
@@ -40,41 +37,6 @@
 #   pragma GCC diagnostic ignored "-Wunsuffixed-float-constants"
 #endif // defined LMI_GCC
 
-/* @(#)fdlibm.h 1.5 04/04/22 */
-/*
- * ====================================================
- * Copyright (C) 2004 by Sun Microsystems, Inc. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-// Apparently the clang maintainers believe that floating-point
-// endianness is necessarily the same as integer endianness.
-#if defined __clang__
-#   if !defined __FLOAT_WORD_ORDER__ && defined __BYTE_ORDER__
-#       define __FLOAT_WORD_ORDER__ __BYTE_ORDER__
-#   endif // !defined __FLOAT_WORD_ORDER__ && defined __BYTE_ORDER__
-#endif // defined __clang__
-
-#if !defined __FLOAT_WORD_ORDER__ || \
-    !defined __ORDER_BIG_ENDIAN__ || \
-    !defined __ORDER_LITTLE_ENDIAN__
-#   error Expected endianness macros not defined.
-#endif // expected endianness macros not defined
-
-#if   __FLOAT_WORD_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#   define FDLIBM_HI(x) *(1+(int*)&x)
-#   define FDLIBM_LO(x) *(int*)&x
-#elif __FLOAT_WORD_ORDER__ == __ORDER_BIG_ENDIAN__
-#   define FDLIBM_HI(x) *(int*)&x
-#   define FDLIBM_LO(x) *(1+(int*)&x)
-#else  // unknown endianness
-#   error Unknown endianness.
-#endif // unknown endianness
-
 /* @(#)s_expm1.c 1.5 04/04/22 */
 /*
  * ====================================================
diff --git a/fdlibm_log1p.c b/fdlibm_log1p.c
index c7edd64d..e1755471 100644
--- a/fdlibm_log1p.c
+++ b/fdlibm_log1p.c
@@ -25,10 +25,7 @@
 // Adapted for lmi by GWC; any defects introduced should not reflect
 // on the reputations of the original authors.
 
-// Generally, lmi '.cpp' files include at least one lmi '.hpp' file,
-// which includes 'config.hpp'. Include 'version.hpp' here because
-// it's the simplest lmi header.
-#include "version.hpp"
+#include "fdlibm.hpp"
 
 #include <stdint.h>
 
@@ -38,41 +35,6 @@
 #   pragma GCC diagnostic ignored "-Wunsuffixed-float-constants"
 #endif // defined LMI_GCC
 
-/* @(#)fdlibm.h 1.5 04/04/22 */
-/*
- * ====================================================
- * Copyright (C) 2004 by Sun Microsystems, Inc. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-// Apparently the clang maintainers believe that floating-point
-// endianness is necessarily the same as integer endianness.
-#if defined __clang__
-#   if !defined __FLOAT_WORD_ORDER__ && defined __BYTE_ORDER__
-#       define __FLOAT_WORD_ORDER__ __BYTE_ORDER__
-#   endif // !defined __FLOAT_WORD_ORDER__ && defined __BYTE_ORDER__
-#endif // defined __clang__
-
-#if !defined __FLOAT_WORD_ORDER__ || \
-    !defined __ORDER_BIG_ENDIAN__ || \
-    !defined __ORDER_LITTLE_ENDIAN__
-#   error Expected endianness macros not defined.
-#endif // expected endianness macros not defined
-
-#if   __FLOAT_WORD_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#   define FDLIBM_HI(x) *(1+(int*)&x)
-// #   define FDLIBM_LO(x) *(int*)&x     // not used in this file
-#elif __FLOAT_WORD_ORDER__ == __ORDER_BIG_ENDIAN__
-#   define FDLIBM_HI(x) *(int*)&x
-// #   define FDLIBM_LO(x) *(1+(int*)&x) // not used in this file
-#else  // unknown endianness
-#   error Unknown endianness.
-#endif // unknown endianness
-
 /* @(#)s_log1p.c 1.3 95/01/18 */
 /*
  * ====================================================