aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-03-30 19:46:57 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-03-30 19:46:57 -0700
commitb9d076fda6b53596bc893ca196c578c8f32e793c (patch)
tree344fe2ba98a03af1b5a9549ccc4b6c9e241ebb6c
parent26be0690260a71d56b6c51a52092d4cbbd736fb6 (diff)
headers fix; fixes #1013
-rw-r--r--system/include/libc/math.h3
-rwxr-xr-xtests/runner.py6
2 files changed, 7 insertions, 2 deletions
diff --git a/system/include/libc/math.h b/system/include/libc/math.h
index e2f8cdef..3bd0621c 100644
--- a/system/include/libc/math.h
+++ b/system/include/libc/math.h
@@ -145,9 +145,10 @@ extern double fmod _PARAMS((double, double));
#ifndef FLT_EVAL_METHOD
#define FLT_EVAL_METHOD 0
+#endif /* FLT_EVAL_METHOD */
+/* XXX EMSCRIPTEN: moved these out of previous if */
typedef float float_t;
typedef double double_t;
-#endif /* FLT_EVAL_METHOD */
#define FP_NAN 0
#define FP_INFINITE 1
diff --git a/tests/runner.py b/tests/runner.py
index cc53ae42..906375a5 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -1635,7 +1635,11 @@ Succeeded!
def test_floatvars(self):
src = '''
#include <stdio.h>
- #include <math.h>
+
+ // headers test, see issue #1013
+ #include<cfloat>
+ #include<cmath>
+
int main(int argc, char **argv)
{
float x = 1.234, y = 3.5, q = 0.00000001;