From 7dbcbc0f762b1d21abc50e79112a0cf9be97bd47 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Mon, 28 Mar 2016 11:05:51 +0200
Subject: [PATCH] + check if OCCGEOMETRY is already defined

---
 .../salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp     | 5 ++++-
 .../src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp         | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
index b647d95fd625..713d09bc0218 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
@@ -61,7 +61,10 @@
 namespace nglib {
 #include <nglib.h>
 }
-#define OCCGEOMETRY
+#ifndef OCCGEOMETRY
+# define OCCGEOMETRY
+#endif
+
 #include <occgeom.hpp>
 #include <meshing.hpp>
 //#include <ngexception.hpp>
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
index 8b55ce510501..50006ac5d7c0 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
@@ -58,8 +58,9 @@ namespace nglib {
 #include <nglib.h>
 }
 #ifndef OCCGEOMETRY
-    #define OCCGEOMETRY
-#endif // #ifndef OCCGEOMETRY
+# define OCCGEOMETRY
+#endif
+
 #include <occgeom.hpp>
 #include <meshing.hpp>
 //#include <meshtype.hpp>