Merge branch 'q3map2help' into 'master'

[xonotic/netradiant.git] / include / modulesystem.h

diff --git a/include/modulesystem.h b/include/modulesystem.h
index 8b1913fb850d26fce2b6162be5abf56ec2117f5c..f7d4656440a1f71c0a54d0474e33225a420ff1af 100644 (file)
--- a/include/modulesystem.h
+++ b/include/modulesystem.h
@@ -22,19 +22,15 @@
 #if !defined( INCLUDED_MODULESYSTEM_H )
 #define INCLUDED_MODULESYSTEM_H
 
+#include "globaldefs.h"
 #include "generic/static.h"
 #include "debugging/debugging.h"
 
-#if defined( WIN32 )
-#ifdef MINGW32
-#define RADIANT_DLLEXPORT __declspec( dllexport )
-#define RADIANT_DLLIMPORT __declspec( dllimport )
+#if GDEF_OS_WINDOWS
+#define RADIANT_DLLEXPORT __declspec(dllexport)
+#define RADIANT_DLLIMPORT __declspec(dllimport)
 #else
-#define RADIANT_DLLEXPORT __stdcall
-#define RADIANT_DLLIMPORT __stdcall
-#endif
-#else
-#define RADIANT_DLLEXPORT
+#define RADIANT_DLLEXPORT __attribute__((visibility("default")))
 #define RADIANT_DLLIMPORT
 #endif
 
@@ -150,7 +146,7 @@ ModuleRef( const char* name ) : m_table( 0 ){
        }
 }
 Type* getTable(){
-#if defined( _DEBUG )
+#if GDEF_DEBUG
        ASSERT_MESSAGE( m_table != 0, "ModuleRef::getTable: type=" << makeQuoted( typename Type::Name() ) << " version=" << makeQuoted( typename Type::Version() ) << " - module-reference used without being initialised" );
 #endif
        return m_table;
@@ -181,7 +177,7 @@ void initialise( const char* name ){
 }
 
 Type* getTable(){
-#if defined( _DEBUG )
+#if GDEF_DEBUG
        ASSERT_MESSAGE( m_table != 0, "SingletonModuleRef::getTable: type=" << makeQuoted( typename Type::Name() ) << " version=" << makeQuoted( typename Type::Version() ) << " - module-reference used without being initialised" );
 #endif
        return m_table;