From: rnv <rnv@opencascade.com>
Date: Fri, 25 Nov 2016 15:58:00 +0000 (+0300)
Subject: Fix preprocessor instructions for GCC
X-Git-Tag: V8_2_0rc1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a977b1282b3c21029db381d9d842b0b9a4783bc3;p=plugins%2Fnetgenplugin.git

Fix preprocessor instructions for GCC
---

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
index 6076844..ecf18ad 100644
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@@ -82,16 +82,16 @@ namespace netgen {
   extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
 #endif
   //extern void OCCSetLocalMeshSize(OCCGeometry & geom, Mesh & mesh);
-#ifdef NETGEN_V5 && WIN32
+#if defined(NETGEN_V5) && defined(WIN32)
   DLL_HEADER 
 #endif
   extern MeshingParameters mparam;
-#ifdef NETGEN_V5 && WIN32
+#if defined(NETGEN_V5) && defined(WIN32)
   DLL_HEADER 
 #endif
   extern volatile multithreadt multithread;
 
-#ifdef NETGEN_V5 && WIN32
+#if defined(NETGEN_V5) && defined(WIN32)
   DLL_HEADER 
 #endif
   extern bool merge_solids;
diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
index 473b5a0..b4c7919 100644
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
@@ -68,7 +68,7 @@ namespace netgen {
 #else
   extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
 #endif
-#ifdef NETGEN_V5 && WIN32
+#if defined(NETGEN_V5) && defined(WIN32)
   DLL_HEADER 
 #endif
   extern MeshingParameters mparam;
diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
index c592be6..6b7c993 100644
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
@@ -81,12 +81,12 @@ namespace netgen {
 #else
   extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
 #endif
-#ifdef NETGEN_V5 && WIN32
+#if defined(NETGEN_V5) && defined(WIN32)
   DLL_HEADER 
 #endif
 extern MeshingParameters mparam;
-#ifdef NETGEN_V5 && WIN32
-  DLL_HEADER 
+#if defined(NETGEN_V5) && defined(WIN32)
+  DLL_HEADER
 #endif
   extern volatile multithreadt multithread;
 }