X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fserver.cpp;h=879770c5e341f169e656f41d30d2a15ee199b43d;hb=c3e5c14ba5970a5f9c58c2129e2d9511ab8ee795;hp=21d95c20f65c54de7daf8cbd1ded886eb2856890;hpb=83113718a4fb6a8e2318841f16f8a0b0eb85675c;p=xonotic%2Fnetradiant.git

diff --git a/radiant/server.cpp b/radiant/server.cpp
index 21d95c20..879770c5 100644
--- a/radiant/server.cpp
+++ b/radiant/server.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "server.h"
+#include "globaldefs.h"
 
 #include "debugging/debugging.h"
 #include "warnings.h"
@@ -60,7 +61,6 @@ DebugMessageHandler& getDebugMessageHandler(){
 }
 
 void registerModule( const char* type, int version, const char* name, Module& module ){
-	ASSERT_NOTNULL( &module );
 	if ( !m_modules.insert( Modules_::value_type( ModuleKey( ModuleType( type, version ), name ), &module ) ).second ) {
 		globalErrorStream() << "module already registered: type=" << makeQuoted( type ) << " name=" << makeQuoted( name ) << "\n";
 	}
@@ -89,7 +89,7 @@ void foreachModule( const char* type, int version, const Visitor& visitor ){
 };
 
 
-#if defined( WIN32 )
+#if GDEF_OS_WINDOWS
 
 #include <windows.h>
 
@@ -140,10 +140,16 @@ FunctionPointer findSymbol( const char* symbol ){
 }
 };
 
-#elif defined( POSIX )
+#elif GDEF_OS_POSIX
 
 #include <dlfcn.h>
 
+#if GDEF_OS_MACOS
+#ifndef RTLD_DEEPBIND
+#define RTLD_DEEPBIND 0
+#endif // RTLD_DEEPBIND
+#endif // GDEF_OS_MACOS
+
 class DynamicLibrary {
 	void *m_library;
 public:
@@ -172,9 +178,9 @@ FunctionPointer findSymbol( const char* symbol ){
 }
 };
 
-#else
+#else // !GDEF_OS_POSIX
 #error "unsupported platform"
-#endif
+#endif // !GDEF_OS_POSIX
 
 class DynamicLibraryModule
 {