Stefan Farthofer (aka meta/metaz):

	Renamed some enums to avoid collitions with windows.h defines



git-svn-id: http://svn.clifford.at/openscad/trunk@86 b57f626f-c46c-0410-a088-ec61d464b74c

1 files changed, 10 insertions, 10 deletions

diff --git a/openscad.h b/openscad.h
index 719b052..716be37 100644
--- a/openscad.h
+++ b/openscad.h
@@ -500,11 +500,11 @@ public:
 	void insert_vertex(double x, double y, double z);
 
 	enum colormode_e {
-		COLOR_NONE,
-		COLOR_MATERIAL,
-		COLOR_CUTOUT,
-		COLOR_HIGHLIGHT,
-		COLOR_BACKGROUND
+		COLORMODE_NONE,
+		COLORMODE_MATERIAL,
+		COLORMODE_CUTOUT,
+		COLORMODE_HIGHLIGHT,
+		COLORMODE_BACKGROUND
 	};
 
 	static QCache<QString,PolySetPtr> ps_cache;
@@ -537,10 +537,10 @@ class CSGTerm
 {
 public:
 	enum type_e {
-		PRIMITIVE,
-		UNION,
-		INTERSECTION,
-		DIFFERENCE
+		TYPE_PRIMITIVE,
+		TYPE_UNION,
+		TYPE_INTERSECTION,
+		TYPE_DIFFERENCE
 	};
 
 	type_e type;
@@ -573,7 +573,7 @@ public:
 	CSGChain();
 
 	void add(PolySet *polyset, double *m, CSGTerm::type_e type, QString label);
-	void import(CSGTerm *term, CSGTerm::type_e type = CSGTerm::UNION);
+	void import(CSGTerm *term, CSGTerm::type_e type = CSGTerm::TYPE_UNION);
 	QString dump();
 };