Fix preprocessor instructions for GCC

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
index 6076844cdc510469767d94e1a4df26c4e065b77b..ecf18ad32749b4e6f82f94135b361e68f2ebf634 100644 (file)
--- 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 473b5a00eda15c9f8b08f1fee900b9b41f97ad9e..b4c7919b141f66a42dd219052ac6db789a5b7427 100644 (file)
--- 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 c592be6900eb0550573412e707b2a6886c8710e8..6b7c993c30b6fad83ba44eb7da7053c67e764246 100644 (file)
--- 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;
 }