2 files changed, 10 insertions, 1 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/system/include/libc/sys/resource.h b/system/include/libc/sys/resource.h
index abcfd34d..1e451e0d 100644
--- a/system/include/libc/sys/resource.h
+++ b/system/include/libc/sys/resource.h
@@ -3,6 +3,10 @@
 
 #include <sys/time.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define	RUSAGE_SELF	0		/* calling process */
 #define	RUSAGE_CHILDREN	-1		/* terminated child processes */
 
@@ -47,5 +51,9 @@ struct rlimit {
 int getrlimit(int resource, struct rlimit *rlim);
 int setrlimit(int resource, const struct rlimit *rlim);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif