Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/PlayerDagostino/SingularityViewer into future

Browse Source 
Conflicts:
	indra/llplugin/llplugininstance.cpp
	indra/llwindow/llwindowsdl.cpp
	indra/llwindow/llwindowsdl.h
	indra/newview/llpreviewnotecard.cpp
	indra/newview/llviewerwindow.h
This commit is contained in:
Siana Gearz
2011-10-03 16:10:35 +02:00
parent 74dc875a27 b65da876f7
commit 9ac2c07f52
40 changed files with 986 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/plugins/webkit/linux_volume_catcher.cpp
View File

@@ -52,6 +52,10 @@ extern "C" {
#include "llaprpool.h"
#include "apr_dso.h"
#ifdef LL_STANDALONE
#include <dlfcn.h>
#include <apr_portable.h>
#endif
}
////////////////////////////////////////////////////
@@ -87,9 +91,16 @@ bool grab_pa_syms(std::string pulse_dso_name)
//attempt to load the shared library
sSymPADSOMemoryPool.create();
#ifdef LL_STANDALONE
void *dso_handle = dlopen(pulse_dso_name.c_str(), RTLD_NOW | RTLD_GLOBAL);
rv = (!dso_handle)?APR_EDSOOPEN:apr_os_dso_handle_put(&sSymPADSOHandle,
dso_handle, sSymPADSOMemoryPool());
if ( APR_SUCCESS == rv )
#else
if ( APR_SUCCESS == (rv = apr_dso_load(&sSymPADSOHandle,
pulse_dso_name.c_str(),
sSymPADSOMemoryPool()) ))
#endif
{
INFOMSG("Found DSO: %s", pulse_dso_name.c_str());