From b2311df4c7be9ba8a90f356d47936428501b7f66 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 19 Dec 2011 13:39:52 +0000
Subject: [PATCH] more win32 fixes
---
contrib/Netgen/README.txt | 15 ++++++++-------
contrib/Netgen/libsrc/include/mydefs.hpp | 2 +-
contrib/Netgen/libsrc/include/nginterface.h | 2 +-
contrib/Netgen/nglib/nglib.h | 3 +--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/contrib/Netgen/README.txt b/contrib/Netgen/README.txt
index 314fff0e0c..c0be29b485 100644
--- a/contrib/Netgen/README.txt
+++ b/contrib/Netgen/README.txt
@@ -2,12 +2,13 @@
This directory contains Joachim Sch\"oberl's NETGEN mesh generator:
The libsrc and nglib directories are unmodified copies taken from
-
- svn co https://netgen-mesher.svn.sourceforge.net/svnroot/netgen-mesher
-
-(SVN rev. 469), with the following exceptions:
-
-* dllexport/dllimport directives have been removed from nglib/nglib.h
-* nglib_gmsh.cpp file replaces the original nglib/nglib.cpp file
+"svn co https://netgen-mesher.svn.sourceforge.net/svnroot/netgen-mesher"
+(svn revision 469), with the following exceptions:
+
+* dllexport/dllimport directives have been removed from
+ nglib/nglib.h
+ libsrc/interface/nginterface.h
+ libsrc/interface/mydefs.hpp
+* nglib_gmsh.cpp reimplements parts of nglib/nglib.cpp
See the LICENSE file for license information.
diff --git a/contrib/Netgen/libsrc/include/mydefs.hpp b/contrib/Netgen/libsrc/include/mydefs.hpp
index 54c14eba22..a821d381f2 100644
--- a/contrib/Netgen/libsrc/include/mydefs.hpp
+++ b/contrib/Netgen/libsrc/include/mydefs.hpp
@@ -24,7 +24,7 @@
#endif
-#ifdef WIN32
+#if 0 // GMSH #ifdef WIN32
#if NGINTERFACE_EXPORTS || NGLIB_EXPORTS || nglib_EXPORTS
#define DLL_HEADER __declspec(dllexport)
#else
diff --git a/contrib/Netgen/libsrc/include/nginterface.h b/contrib/Netgen/libsrc/include/nginterface.h
index 85ae8d6d78..f15c930e14 100644
--- a/contrib/Netgen/libsrc/include/nginterface.h
+++ b/contrib/Netgen/libsrc/include/nginterface.h
@@ -16,7 +16,7 @@
*/
-#ifdef WIN32
+#if 0 // GMSH #ifdef WIN32
#if NGINTERFACE_EXPORTS || NGLIB_EXPORTS || nglib_EXPORTS
#define DLL_HEADER __declspec(dllexport)
#else
diff --git a/contrib/Netgen/nglib/nglib.h b/contrib/Netgen/nglib/nglib.h
index a3bb606288..fc4d174ad9 100644
--- a/contrib/Netgen/nglib/nglib.h
+++ b/contrib/Netgen/nglib/nglib.h
@@ -23,8 +23,7 @@
// Philippose - 14.02.2009
// Modifications for creating a DLL in Windows
-//#ifdef WIN32
-#if 0 // for GMSH
+#if 0 // GMSH #ifdef WIN32
#ifdef NGLIB_EXPORTS || nglib_EXPORTS
#define DLL_HEADER __declspec(dllexport)
#else
--
GitLab