From 62b0c91625a350d06330c575c173e93d37d7f338 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 21 Sep 2011 14:38:22 +0000
Subject: [PATCH] fix windows build (don't define 'POINTS' as it's reserved by
win32)
---
Graphics/drawAxes.cpp | 3 ---
contrib/DiscreteIntegration/DILevelset.h | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/Graphics/drawAxes.cpp b/Graphics/drawAxes.cpp
index 21b5e6fa92..db915e7c38 100644
--- a/Graphics/drawAxes.cpp
+++ b/Graphics/drawAxes.cpp
@@ -327,9 +327,6 @@ void drawContext::drawAxes()
CTX::instance()->rotationCenter[1], CTX::instance()->rotationCenter[2],
CTX::instance()->geom.light);
}
-
-
-
}
void drawContext::drawSmallAxes()
diff --git a/contrib/DiscreteIntegration/DILevelset.h b/contrib/DiscreteIntegration/DILevelset.h
index d4e25ad161..865507a267 100644
--- a/contrib/DiscreteIntegration/DILevelset.h
+++ b/contrib/DiscreteIntegration/DILevelset.h
@@ -20,7 +20,7 @@
#define CYLINDER 8
#define CONROD 9
#define LSMESH 10
-#define POINTS 11
+#define LSPOINTS 11 // don't define 'POINTS' as it's reserved by win32
// TOOLS
#define CUT 11
#define UNION 12
@@ -166,7 +166,7 @@ public:
// return negative value inward and positive value outward
virtual double operator() (const double &x, const double &y, const double &z) const;
void computeLS(std::vector<MVertex*> &vert);
- int type() const {return POINTS;}
+ int type() const {return LSPOINTS;}
};
class gLevelsetQuadric : public gLevelsetPrimitive
--
GitLab