Skip to content

Commit

Permalink
Revert "Fix startup crash in x86 Linux builds"
Browse files Browse the repository at this point in the history
This reverts commit b2ad4f7.
  • Loading branch information
jushar committed Jul 19, 2017
1 parent 5672f84 commit e95a79c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Server/core/CDynamicLibrary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ bool CDynamicLibrary::Load ( const char* szFilename )
LocalFree ( lpMsgBuf );
}
#else
m_hModule = dlopen ( szFilename, RTLD_NOW | RTLD_DEEPBIND );
m_hModule = dlopen ( szFilename, RTLD_NOW );

// Output error if needed
if ( !m_hModule )
Expand Down
2 changes: 1 addition & 1 deletion Server/launcher/CDynamicLibrary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ bool CDynamicLibrary::Load ( const char* szFilename )
#ifdef WIN32
m_hModule = LoadLibrary ( szFilename );
#else
m_hModule = dlopen ( szFilename, RTLD_NOW | RTLD_DEEPBIND );
m_hModule = dlopen ( szFilename, RTLD_NOW );

// Output error if needed
if ( !m_hModule )
Expand Down
2 changes: 1 addition & 1 deletion Server/mods/deathmatch/logic/CDynamicLibrary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ bool CDynamicLibrary::Load ( const char* szFilename )
}

#else
m_hModule = dlopen ( szFilename, RTLD_NOW | RTLD_DEEPBIND );
m_hModule = dlopen ( szFilename, RTLD_NOW );

// Output error if needed
if ( !m_hModule )
Expand Down
2 changes: 1 addition & 1 deletion Server/mods/deathmatch/logic/lua/CLuaModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ int CLuaModule::_LoadModule ( void )
strError = SString( "%d", GetLastError() );
SetCurrentDirectory( strSavedCurrentDirectory );
#else
m_hModule = dlopen ( m_szFileName, RTLD_NOW | RTLD_DEEPBIND );
m_hModule = dlopen ( m_szFileName, RTLD_NOW );
if ( m_hModule == NULL )
strError = dlerror();
#endif
Expand Down

0 comments on commit e95a79c

Please sign in to comment.