move D_PNAN/D_PINF/etc constants into static defines

JuliaLang · Dec 25, 2014 · 4e65472 · 4e65472 · svaksha · Dec 25, 2014
1 parent 9d2c004
commit 4e65472
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 38 deletions.
diff --git a/src/builtins.c b/src/builtins.c
@@ -14,14 +14,8 @@
 #include <fcntl.h>
 #if defined(_OS_WINDOWS_)
 #include <malloc.h>
-#if defined(_COMPILER_INTEL_)
-#include <mathimf.h>
-#else
-#include <math.h>
-#endif
 #else
 #include <unistd.h>
-#include <math.h>
 #endif
 #include <ctype.h>
 #include "julia.h"

diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -1,18 +1,4 @@
 #include "platform.h"
-/*
- * We include <mathimf.h> here, because somewhere below <math.h> is included also.
- * As a result, Intel C++ Composer generates an error. To prevent this error, we
- * include <mathimf.h> as soon as possible. <mathimf.h> defines several macros
- * (like _INC_MATH, __MATH_H_INCLUDED, __COMPLEX_H_INCLUDED) that prevent
- * including <math.h> (or rather its content).
- */
-#if defined(_OS_WINDOWS_)
-#if defined(_COMPILER_INTEL_)
-#include <mathimf.h>
-#else
-#include <math.h>
-#endif
-#endif
 
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS

diff --git a/src/support/dtypes.h b/src/support/dtypes.h
@@ -4,6 +4,11 @@
 #include <stddef.h>
 #include <stddef.h> // double include of stddef.h fixes #3421
 #include <stdint.h>
+#if defined(_COMPILER_INTEL_)
+#include <mathimf.h>
+#else
+#include <math.h>
+#endif
 
 #include "platform.h"
 
@@ -173,14 +178,14 @@ typedef uptrint_t u_ptrint_t;
 #define S32_MIN (-S32_MAX - 1L)
 #define BIT31 0x80000000
 
-extern double D_PNAN;
-extern double D_NNAN;
-extern double D_PINF;
-extern double D_NINF;
-extern float F_PNAN;
-extern float F_NNAN;
-extern float F_PINF;
-extern float F_NINF;
+#define D_PNAN ((double)+NAN)
+#define D_NNAN ((double)-NAN)
+#define D_PINF ((double)+INFINITY)
+#define D_NINF ((double)-INFINITY)
+#define F_PNAN ((float)+NAN)
+#define F_NNAN ((float)-NAN)
+#define F_PINF ((float)+INFINITY)
+#define F_NINF ((float)-INFINITY)
 
 typedef enum { T_INT8, T_UINT8, T_INT16, T_UINT16, T_INT32, T_UINT32,
  T_INT64, T_UINT64, T_FLOAT, T_DOUBLE } numerictype_t;

diff --git a/src/support/libsupportinit.c b/src/support/libsupportinit.c
@@ -1,16 +1,10 @@
 #include <locale.h>
-#include <math.h>
 #include "libsupport.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-double D_PNAN;
-double D_NNAN;
-double D_PINF;
-double D_NINF;
-
 static int isInitialized = 0;
 
 void libsupport_init(void)
@@ -24,10 +18,6 @@ void libsupport_init(void)
 
  ios_init_stdstreams();
 
- D_PNAN = +NAN;
- D_NNAN = -NAN;
- D_PINF = +INFINITY;
- D_NINF = -INFINITY;
  isInitialized=1;
  }
 }