Changeset: f297415081c8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f297415081c8 Modified Files: gdk/gdk_aggr.c gdk/gdk_atoms.c gdk/gdk_calc.c geom/monetdb5/geom.h monetdb5/modules/kernel/batmmath.h monetdb5/modules/kernel/mmath.h monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/calc.c sql/backends/monet5/generator/generator.c Branch: Jul2017 Log Message:
Get rid of mathimf.h: with more modern compilers we don't need it. diffs (125 lines): diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c --- a/gdk/gdk_aggr.c +++ b/gdk/gdk_aggr.c @@ -10,11 +10,7 @@ #include "gdk.h" #include "gdk_private.h" #include "gdk_calc_private.h" -#if defined(_MSC_VER) && defined(__INTEL_COMPILER) -#include <mathimf.h> -#else #include <math.h> -#endif /* grouped aggregates * diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c --- a/gdk/gdk_atoms.c +++ b/gdk/gdk_atoms.c @@ -23,11 +23,7 @@ #include "monetdb_config.h" #include "gdk.h" #include "gdk_private.h" -#if defined(_MSC_VER) && defined(__INTEL_COMPILER) -#include <mathimf.h> /* Intel compiler on Windows */ -#else -#include <math.h> /* anywhere else */ -#endif +#include <math.h> /* these are only for older Visual Studio compilers (VS 2010) */ #if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && _MSC_VER < 1800 diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c --- a/gdk/gdk_calc.c +++ b/gdk/gdk_calc.c @@ -10,11 +10,7 @@ #include "gdk.h" #include "gdk_private.h" #include "gdk_calc_private.h" -#if defined(_MSC_VER) && defined(__INTEL_COMPILER) -#include <mathimf.h> -#else #include <math.h> -#endif /* Define symbol FULL_IMPLEMENTATION to get implementations for all * sensible output types for +, -, *, /. Without the symbol, all diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h --- a/geom/monetdb5/geom.h +++ b/geom/monetdb5/geom.h @@ -22,11 +22,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#if defined(_MSC_VER) && defined(__INTEL_COMPILER) -#include <mathimf.h> -#else #include <math.h> -#endif #include <time.h> #include <gdk_logger.h> diff --git a/monetdb5/modules/kernel/batmmath.h b/monetdb5/modules/kernel/batmmath.h --- a/monetdb5/modules/kernel/batmmath.h +++ b/monetdb5/modules/kernel/batmmath.h @@ -9,7 +9,7 @@ #ifndef _BATMATH_H #define _BATMATH_H #include "gdk.h" -#include "math.h" +#include <math.h> #include "mal_exception.h" #define radians(x) ((x) * 3.14159265358979323846 / 180.0) diff --git a/monetdb5/modules/kernel/mmath.h b/monetdb5/modules/kernel/mmath.h --- a/monetdb5/modules/kernel/mmath.h +++ b/monetdb5/modules/kernel/mmath.h @@ -10,11 +10,7 @@ #define __MMATH_H__ #include "mal.h" #include "mal_exception.h" -#if defined(_MSC_VER) && defined(__INTEL_COMPILER) -#include <mathimf.h> /* Intel compiler on Windows */ -#else -#include <math.h> /* anywhere else */ -#endif +#include <math.h> /* these are only for older Visual Studio compilers (VS 2010) */ #if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && _MSC_VER < 1800 diff --git a/monetdb5/modules/mal/batcalc.c b/monetdb5/modules/mal/batcalc.c --- a/monetdb5/modules/mal/batcalc.c +++ b/monetdb5/modules/mal/batcalc.c @@ -8,7 +8,7 @@ #include "monetdb_config.h" #include "gdk.h" -#include "math.h" +#include <math.h> #include "mal_exception.h" #include "mal_interpreter.h" diff --git a/monetdb5/modules/mal/calc.c b/monetdb5/modules/mal/calc.c --- a/monetdb5/modules/mal/calc.c +++ b/monetdb5/modules/mal/calc.c @@ -8,7 +8,7 @@ #include "monetdb_config.h" #include "gdk.h" -#include "math.h" +#include <math.h> #include "mal_exception.h" #include "mal_interpreter.h" diff --git a/sql/backends/monet5/generator/generator.c b/sql/backends/monet5/generator/generator.c --- a/sql/backends/monet5/generator/generator.c +++ b/sql/backends/monet5/generator/generator.c @@ -16,7 +16,7 @@ #include "algebra.h" #include "generator.h" #include "mtime.h" -#include "math.h" +#include <math.h> #define IDENTITY(x) (x) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
