Merge branch 'fix_warning_dll_header' into 'master'

fix warning about multiple definition of dll_header

See merge request jschoeberl/netgen!304
This commit is contained in:
Joachim Schöberl 2019-12-06 12:41:46 +00:00
commit ec786de3e2
2 changed files with 9 additions and 14 deletions

View File

@ -18,18 +18,12 @@
*/
#ifdef WIN32
#if NGINTERFACE_EXPORTS || NGLIB_EXPORTS || nglib_EXPORTS
#define DLL_HEADER __declspec(dllexport)
#else
#define DLL_HEADER __declspec(dllimport)
#endif
#else
#if __GNUC__ >= 4
#define DLL_HEADER __attribute__ ((visibility ("default")))
#else
#define DLL_HEADER
#endif
#ifndef DLL_HEADER
#if NGINTERFACE_EXPORTS || NGLIB_EXPORTS || nglib_EXPORTS
#define DLL_HEADER NGCORE_API_EXPORT
#else
#define DLL_HEADER NGCORE_API_IMPORT
#endif
#endif

View File

@ -23,6 +23,7 @@
// Philippose - 14.02.2009
// Modifications for creating a DLL in Windows
#ifndef DLL_HEADER
#ifdef WIN32
#ifdef NGLIB_EXPORTS || nglib_EXPORTS
#define DLL_HEADER __declspec(dllexport)
@ -30,9 +31,9 @@
#define DLL_HEADER __declspec(dllimport)
#endif
#else
#define DLL_HEADER
#define DLL_HEADER __attribute__((visibility("default")))
#endif
#endif
// ** Constants used within Netgen *********************