D 2020-06-09T22:14:25.168
J foundin trunk
J icomment Hi\sde!\r\n\r\nI\sconfirm\sthis\sissue\son\smy\sbox\s(but\sI\sdon't\sknow\swhy\sthis\swould\sbe\sspecific\sto\smacOS,\sor\swhy\syou\sdon't\ssee\sthe\ssymbol\sduplicates\selsewhere).\r\n\r\nBetween\sthese\stwo\scommits\s\r\n\r\n\s\s\s\s\sfossil\sdiff\s--from\sd4bb0eb147b1671a\s--to\sd41caf001d9d4d2a\r\n\r\nin\stdomDecls.h\syou\sdropped\s\s"extern"\sfor\r\n\s\s\s\r\n\s\s\s-extern\sconst\sTdomStubs\s*tdomStubsPtr;\r\n\s\s\s+const\sTdomStubs\s*tdomStubsPtr;\r\n\r\nThis\sleads\sto\sthe\sclassic\sduplicate\sdefinition\sin\sthe\scompilation\sunits\sincluding\stdomDecls.h\sduring\slinking\s(tdominit.c\sand\stdomStubLib.c,\sfor\sexample).\s\r\n\r\nThe\sbelow\sfixes\sthis\sfor\sme\s(and\saligns\sthe\sdefinition\sin\stdominit.c).\r\n\r\n-------%<-------\s\r\nIndex:\sgeneric/tdomDecls.h\r\n==================================================================\r\n---\sgeneric/tdomDecls.h\r\n+++\sgeneric/tdomDecls.h\r\n@@\s-85,11\s+85,11\s@@\r\n\s\s\s\s\sint\s(*xML_GetIdAttributeIndex)\s(XML_Parser\sparser);\s/*\s15\s*/\r\n\s\s\s\s\sdomNode\s*\s(*tcldom_getNodeFromName)\s(Tcl_Interp\s*interp,\schar\s*nodeName,\schar\s**errMsg);\s/*\s16\s*/\r\n\s\s\s\s\sdomDocument\s*\s(*tcldom_getDocumentFromName)\s(Tcl_Interp\s*interp,\schar\s*docName,\schar\s**errMsg);\s/*\s17\s*/\r\n\s}\sTdomStubs;\r\n\s\r\n-const\sTdomStubs\s*tdomStubsPtr;\r\n+EXTERN\sconst\sTdomStubs\s*tdomStubsPtr;\r\n\s\r\n\s#ifdef\s__cplusplus\r\n\s}\r\n\s#endif\r\n\s\r\n\r\nIndex:\sgeneric/tdominit.c\r\n==================================================================\r\n---\sgeneric/tdominit.c\r\n+++\sgeneric/tdominit.c\r\n@@\s-39,11\s+39,11\s@@\r\n\s#include\s<dom.h>\r\n\s#include\s<tdom.h>\r\n\s#include\s<tcldom.h>\r\n\s#include\s<tclpull.h>\r\n\s\r\n-extern\sTdomStubs\stdomStubs;\r\n+const\sTdomStubs\s*tdomStubsPtr;\r\n\s\r\n\s/*\r\n\s\s*----------------------------------------------------------------------------\r\n\s\s*\r\n\s\s*\sTdom_Init\s--\r\n@@\s-93,11\s+93,11\s@@\r\n\s\s\s\s\sTcl_CreateObjCommand(interp,\s"tdom::pullparser",\stDOM_PullParserCmd,\sNULL,\sNULL\s);\s\s\s\s\r\n\s#endif\r\n\s\s\s\s\s\r\n\s#ifdef\sUSE_TCL_STUBS\r\n\s\s\s\s\sTcl_PkgProvideEx(interp,\sPACKAGE_NAME,\sPACKAGE_VERSION,\s\r\n-\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s(ClientData)\s&tdomStubs);\r\n+\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s(ClientData)\stdomStubsPtr);\r\n\s#else\r\n\s\s\s\s\sTcl_PkgProvide(interp,\sPACKAGE_NAME,\sPACKAGE_VERSION);\r\n\s#endif\r\n\s\r\n\s\s\s\s\sreturn\sTCL_OK;\r\n-------%<-------\s\r\n\r\nHTH,\smr_calvin
J login anonymous
J mimetype text/x-fossil-plain
K c6cc9e097be16bd328603059e0ac3a73269ef25e
U anonymous
Z a76f7a7cf25c70cb8c932486610c75fa