From: Szabolcs Nagy <nsz@port70.net>
Date: Mon, 6 May 2013 17:52:48 +0000 (+0000)
Subject: remove compound literals from math.h to please c++
X-Git-Tag: v0.9.11~59
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2897bfdd602f3d6a0724bbfdd543e962926b5bbe;p=oweals%2Fmusl.git

remove compound literals from math.h to please c++

__FLOAT_BITS and __DOUBLE_BITS macros used union compound literals,
now they are changed into static inline functions. A good C compiler
generates the same code for both and the later is C++ conformant.
---

diff --git a/include/math.h b/include/math.h
index c4da4116..01428152 100644
--- a/include/math.h
+++ b/include/math.h
@@ -43,11 +43,16 @@ int __fpclassify(double);
 int __fpclassifyf(float);
 int __fpclassifyl(long double);
 
-union __float_repr { float __f; __uint32_t __i; };
-union __double_repr { double __f; __uint64_t __i; };
-
-#define __FLOAT_BITS(f) (((union __float_repr){ (float)(f) }).__i)
-#define __DOUBLE_BITS(f) (((union __double_repr){ (double)(f) }).__i)
+static __inline __uint32_t __FLOAT_BITS(float __f)
+{
+	union {float __f; __uint32_t __i;} __u = {__f};
+	return __u.__i;
+}
+static __inline __uint64_t __DOUBLE_BITS(double __f)
+{
+	union {double __f; __uint64_t __i;} __u = {__f};
+	return __u.__i;
+}
 
 #define fpclassify(x) ( \
 	sizeof(x) == sizeof(float) ? __fpclassifyf(x) : \