Changeset 58775d30 in mainline for uspace/lib/math/include/mathtypes.h

Timestamp:

2015-03-16T16:07:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2003739

Parents:

6069061 (diff), 795e2bf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes

File:

• uspace/lib/math/include/mathtypes.h (modified) (1 diff)

uspace/lib/math/include/mathtypes.h

@@ -191 +191 @@
 #endif
 
-typedef union {
-        float val;
-        
+
 #if defined(FLOAT_SIZE_32)
+
+#ifndef float32_t
+        #define float32_t  float
+#endif
+
+#elif defined(FLOAT_SIZE_64)
+
+#ifndef float64_t
+        #define float64_t  float
+#endif
+
+#elif defined(FLOAT_SIZE_96)
+
+#ifndef float96_t
+        #define float96_t  float
+#endif
+
+#elif defined(FLOAT_SIZE_128)
+
+#ifndef float128_t
+        #define float128_t  float
+#endif
+
+#endif
+
+
+#if defined(DOUBLE_SIZE_32)
+
+#ifndef float32_t
+        #define float32_t  double
+#endif
+
+#elif defined(DOUBLE_SIZE_64)
+
+#ifndef float64_t
+        #define float64_t  double
+#endif
+
+#elif defined(DOUBLE_SIZE_96)
+
+#ifndef float96_t
+        #define float96_t  double
+#endif
+
+#elif defined(DOUBLE_SIZE_128)
+
+#ifndef float128_t
+        #define float128_t  double
+#endif
+
+#endif
+
+
+#if defined(LONG_DOUBLE_SIZE_32)
+
+#ifndef float32_t
+        #define float32_t  long double
+#endif
+
+#elif defined(LONG_DOUBLE_SIZE_64)
+
+#ifndef float64_t
+        #define float64_t  long double
+#endif
+
+#elif defined(LONG_DOUBLE_SIZE_96)
+
+#ifndef float96_t
+        #define float96_t  long double
+#endif
+
+#elif defined(LONG_DOUBLE_SIZE_128)
+
+#ifndef float128_t
+        #define float128_t  long double
+#endif
+
+#endif
+
+
+#ifdef float32_t
+
+typedef union {
+        float32_t val;
         float32 data;
-#elif defined(FLOAT_SIZE_64)
+} float32_u;
+
+#endif
+
+#ifdef float64_t
+
+typedef union {
+        float64_t val;
         float64 data;
-#elif defined(FLOAT_SIZE_96)
+} float64_u;
+
+#endif
+
+#ifdef float96_t
+
+typedef union {
+        float96_t val;
         float96 data;
-#elif defined(FLOAT_SIZE_128)
+} float96_u;
+
+#endif
+
+#ifdef float128_t
+
+typedef union {
+        float128_t val;
         float128 data;
-#else
-        #error Unsupported float size
-#endif
-} float_t;
-
-typedef union {
-        double val;
-        
-#if defined(DOUBLE_SIZE_32)
-        float32 data;
-#elif defined(DOUBLE_SIZE_64)
-        float64 data;
-#elif defined(DOUBLE_SIZE_96)
-        float96 data;
-#elif defined(DOUBLE_SIZE_128)
-        float128 data;
-#else
-        #error Unsupported double size
-#endif
-} double_t;
-
-typedef union {
-        long double val;
-        
-#if defined(LONG_DOUBLE_SIZE_32)
-        float32 data;
-#elif defined(LONG_DOUBLE_SIZE_64)
-        float64 data;
-#elif defined(LONG_DOUBLE_SIZE_96)
-        float96 data;
-#elif defined(LONG_DOUBLE_SIZE_128)
-        float128 data;
-#else
-        #error Unsupported long double size
-#endif
-} long_double_t;
+} float128_u;
+
+#endif
 
 #endif