ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-26 04:40:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_warning_dll_header' into 'master'

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libsrc/include/nginterface.h
View File

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

5
nglib/nglib.h
View File

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