gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixups for old ABI.

Browse source
This commit is contained in:
rfm 2024-12-19 11:48:10 +00:00
parent d5da27bcbc
commit 1f0bac21e3
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Source/NSXMLDocument.m
View file

@ -284,10 +284,10 @@ GS_PRIVATE_INTERNAL(NSXMLDocument)
// FIXME: Should we use addChild: here?
xmlDocSetRootElement(internal->node.doc, [root _node]);
if (root->detached)
if (GSIVar(root, detached))
{
xmlFreeDoc(root->detached);
root->detached = 0;
xmlFreeDoc(GSIVar(root, detached));
GSIVar(root, detached) = 0;
}
// Do our subNode housekeeping...

20
Source/NSXMLNode.m
View file

@ -564,7 +564,7 @@ isEqualTree(xmlNodePtr nodeA, xmlNodePtr nodeB)
if (ensure_oldNs(parentNode))
{
detached = parentNode->doc;
internal->detached = parentNode->doc;
}
ns = tmp->oldNs;
@ -641,9 +641,9 @@ isEqualTree(xmlNodePtr nodeA, xmlNodePtr nodeB)
#else
xmlSetTreeDoc(childNode, parentNode->doc);
#endif
if (tmp == child->detached)
if (tmp == GSIVar(child, detached))
{
child->detached = 0;
GSIVar(child, detached) = 0;
}
xmlFreeDoc(tmp);
}
@ -1308,7 +1308,7 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants,
{
if (theNode->doc)
{
if (theNode->doc == detached)
if (theNode->doc == internal->detached)
{
return; // Already detached.
}
@ -1316,11 +1316,11 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants,
* This is needed so that the strings of the nodes subtree
* get stored in the dictionary of this new document.
*/
detached = xmlNewDoc((xmlChar *)"1.0");
internal->detached = xmlNewDoc((xmlChar *)"1.0");
#if LIBXML_VERSION >= 20620
xmlDOMWrapAdoptNode(NULL, theNode->doc, theNode, detached,
NULL, 0);
xmlDOMWrapAdoptNode(NULL, theNode->doc, theNode,
internal->detached, NULL, 0);
#else
xmlSetTreeDoc(theNode, detached);
#endif
@ -1753,7 +1753,7 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants,
// but we don't want to return this.
return nil;
}
if (theNode->doc == detached)
if (theNode->doc == internal->detached)
{
return nil; // the document is private from when we detached
}
@ -1849,7 +1849,7 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants,
if (ensure_oldNs(theNode))
{
detached = theNode->doc;
internal->detached = theNode->doc;
}
// Fake the name space and fix it later
@ -1982,7 +1982,7 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants,
if (ensure_oldNs(theNode))
{
detached = theNode->doc;
internal->detached = theNode->doc;
}
// Fake the name space and fix it later

2
Source/NSXMLPrivate.h
View file

@ -159,7 +159,7 @@ union\
NSUInteger options; \
id objectValue; \
NSMutableArray *subNodes; \
xmlDoc *detached;
xmlDoc *detached; \
/* When using the non-fragile ABI, the instance variables are exposed to the