updated to more recent libxml2 version (work in progress)
This commit is contained in:
@@ -85,7 +85,7 @@ xmlModuleOpen(const char *name, int options ATTRIBUTE_UNUSED)
|
||||
__xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_MODULE,
|
||||
XML_MODULE_OPEN, XML_ERR_FATAL, NULL, 0, 0,
|
||||
name, NULL, 0, 0, "failed to open %s\n", name);
|
||||
return 0;
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
module->name = xmlStrdup((const xmlChar *) name);
|
||||
@@ -179,7 +179,7 @@ xmlModuleFree(xmlModulePtr module)
|
||||
{
|
||||
if (NULL == module) {
|
||||
__xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_MODULE,
|
||||
XML_MODULE_CLOSE, XML_ERR_FATAL, NULL, 0, 0,
|
||||
XML_MODULE_CLOSE, XML_ERR_FATAL, NULL, 0, NULL,
|
||||
NULL, NULL, 0, 0, "null module pointer\n");
|
||||
return -1;
|
||||
}
|
||||
@@ -195,6 +195,10 @@ xmlModuleFree(xmlModulePtr module)
|
||||
#include <dlfcn.h>
|
||||
#endif
|
||||
|
||||
#ifndef RTLD_GLOBAL /* For Tru64 UNIX 4.0 */
|
||||
#define RTLD_GLOBAL 0
|
||||
#endif
|
||||
|
||||
/**
|
||||
* xmlModulePlatformOpen:
|
||||
* @name: path to the module
|
||||
@@ -277,10 +281,7 @@ xmlModulePlatformSymbol(void *handle, const char *name, void **symbol)
|
||||
int rc;
|
||||
|
||||
errno = 0;
|
||||
rc = shl_findsym(handle, name, TYPE_PROCEDURE, symbol);
|
||||
if ((-1 == rc) && (0 == errno)) {
|
||||
rc = shl_findsym(handle, name, TYPE_DATA, symbol);
|
||||
}
|
||||
rc = shl_findsym(&handle, name, TYPE_UNDEFINED, symbol);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user