diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CSGTermEvaluator.h | 4 | ||||
| -rw-r--r-- | src/dxfdata.h | 5 | ||||
| -rw-r--r-- | src/lexer.l | 7 | ||||
| -rw-r--r-- | src/linalg.h | 4 |
4 files changed, 16 insertions, 4 deletions
diff --git a/src/CSGTermEvaluator.h b/src/CSGTermEvaluator.h index 3a8122b..9d1fabe 100644 --- a/src/CSGTermEvaluator.h +++ b/src/CSGTermEvaluator.h @@ -7,6 +7,10 @@ #include <cstddef> #include "visitor.h" +#if defined __WIN32__ && ! defined _MSC_VER +#include <cstddef> +#endif + class CSGTermEvaluator : public Visitor { public: diff --git a/src/dxfdata.h b/src/dxfdata.h index d24541c..e2f229e 100644 --- a/src/dxfdata.h +++ b/src/dxfdata.h @@ -1,5 +1,8 @@ #ifndef DXFDATA_H_ #define DXFDATA_H_ +#ifndef EIGEN_DONT_ALIGN +#define EIGEN_DONT_ALIGN +#endif #include <vector> #include <Eigen/Dense> @@ -30,7 +33,7 @@ public: } }; - std::vector<Vector2d, Eigen::aligned_allocator<Vector2d> > points; + std::vector<Vector2d> points; std::vector<Path> paths; std::vector<Dim> dims; diff --git a/src/lexer.l b/src/lexer.l index 3cd4a19..cf5cb6d 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -35,8 +35,11 @@ #include <QDir> #include <assert.h> -//isatty for visual c++ -#ifdef _MSC_VER +//isatty for visual c++ and mingw-cross-env +#if defined __WIN32__ && ! defined _MSC_VER +#include "unistd.h" +#endif +#if defined __WIN32__ || defined _MSC_VER extern "C" int __cdecl _isatty(int _FileHandle); #define isatty _isatty #endif diff --git a/src/linalg.h b/src/linalg.h index 06991cf..eb1ed3c 100644 --- a/src/linalg.h +++ b/src/linalg.h @@ -1,6 +1,8 @@ #ifndef LINALG_H_ #define LINALG_H_ - +#ifndef EIGEN_DONT_ALIGN +#define EIGEN_DONT_ALIGN +#endif #include <Eigen/Core> #include <Eigen/Geometry> |