diff options
author | Anatol Belski <ab@php.net> | 2018-12-09 18:59:05 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2018-12-09 18:59:05 +0100 |
commit | 0d166f76eef184ae4b1cff904253d926906429ff (patch) | |
tree | d6c2abcee59363cb52bece26e8ef13a29ab6b023 /ext/tidy | |
parent | 99f1f3dedfdd9c2c10962bf83c0e52fd60366928 (diff) | |
download | php-git-0d166f76eef184ae4b1cff904253d926906429ff.tar.gz |
Fix libtidy exports when ext/tidy compiled static
Diffstat (limited to 'ext/tidy')
-rw-r--r-- | ext/tidy/config.w32 | 8 | ||||
-rw-r--r-- | ext/tidy/php_tidy.def | 420 |
2 files changed, 167 insertions, 261 deletions
diff --git a/ext/tidy/config.w32 b/ext/tidy/config.w32 index aa4eb46539..20f29bd281 100644 --- a/ext/tidy/config.w32 +++ b/ext/tidy/config.w32 @@ -4,7 +4,9 @@ ARG_WITH("tidy", "TIDY support", "no"); if (PHP_TIDY != "no") { - if (CHECK_LIB("libtidy_a.lib;libtidy.lib;tidy_a.lib;tidy.lib", "tidy", PHP_TIDY) && + var tidy_static = false; + if (CHECK_LIB("libtidy_a.lib;tidy_a.lib", "tidy", PHP_TIDY) && (tidy_static = true) || + CHECK_LIB("libtidy.lib;tidy.lib", "tidy", PHP_TIDY)) && ( CHECK_HEADER_ADD_INCLUDE("tidy.h", "CFLAGS_TIDY") || CHECK_HEADER_ADD_INCLUDE("tidy/tidy.h", "CFLAGS_TIDY", null, null, true) || @@ -22,6 +24,10 @@ if (PHP_TIDY != "no") { if (!PHP_TIDY_SHARED) { ADD_DEF_FILE("ext\\tidy\\php_tidy.def"); } + if (tidy_static) { + ADD_FLAG("CFLAGS_TIDY", "/DTIDY_STATIC=1"); + } + } else { WARNING("tidy not enabled; libraries and headers not found"); } diff --git a/ext/tidy/php_tidy.def b/ext/tidy/php_tidy.def index 1d438a7162..8a30c4b0e4 100644 --- a/ext/tidy/php_tidy.def +++ b/ext/tidy/php_tidy.def @@ -1,290 +1,190 @@ EXPORTS -tidyBufInit +TidyLangPosixName +TidyLangWindowsName +getErrorCodeList +getInstalledLanguageList +getNextErrorCode +getNextInstalledLanguage +getNextStringKey +getNextWindowsLanguage +getStringKeyList +getWindowsLanguageList +tidyAccessWarningCount +tidyAttrDiscard +tidyAttrFirst +tidyAttrGetById +tidyAttrGetId +tidyAttrIsEvent +tidyAttrName +tidyAttrNext +tidyAttrValue tidyBufAlloc +tidyBufAllocWithAllocator +tidyBufAppend +tidyBufAttach tidyBufCheckAlloc -tidyBufFree tidyBufClear -tidyBufAttach tidyBufDetach -tidyBufAppend -tidyBufPutByte -tidyBufPopByte -tidyBufGetByte tidyBufEndOfInput +tidyBufFree +tidyBufGetByte +tidyBufInit +tidyBufInitWithAllocator +tidyBufPopByte +tidyBufPutByte tidyBufUngetByte +tidyCleanAndRepair +tidyConfigErrorCount tidyCreate -tidyRelease -tidySetAppData -tidyGetAppData -tidyReleaseDate -tidyStatus +tidyCreateWithAllocator +tidyDefaultString +tidyDetectedGenericXml tidyDetectedHtmlVersion tidyDetectedXhtml -tidyDetectedGenericXml +tidyDiscardElement +tidyErrorCodeAsKey +tidyErrorCodeFromKey tidyErrorCount -tidyWarningCount -tidyAccessWarningCount -tidyConfigErrorCount -tidyLoadConfig -tidyLoadConfigEnc +tidyErrorSummary tidyFileExists -tidySetCharEncoding -tidySetOptionCallback -tidyOptGetIdForName -tidyGetOptionList +tidyGeneralInfo +tidyGetAppData +tidyGetArgFormat +tidyGetArgType +tidyGetArgValueDouble +tidyGetArgValueInt +tidyGetArgValueString +tidyGetArgValueUInt +tidyGetBody +tidyGetByte +tidyGetChild +tidyGetEmacsFile +tidyGetHead +tidyGetHtml +tidyGetLanguage +tidyGetMessage +tidyGetMessageArguments +tidyGetMessageCode +tidyGetMessageColumn +tidyGetMessageDefault +tidyGetMessageDoc +tidyGetMessageFormat +tidyGetMessageFormatDefault +tidyGetMessageIsMuted +tidyGetMessageKey +tidyGetMessageLevel +tidyGetMessageLine +tidyGetMessageOutput +tidyGetMessageOutputDefault +tidyGetMessagePos +tidyGetMessagePosDefault +tidyGetMessagePrefix +tidyGetMessagePrefixDefault +tidyGetNext +tidyGetNextMessageArgument tidyGetNextOption tidyGetOption tidyGetOptionByName -tidyOptGetId -tidyOptGetName -tidyOptGetType -tidyOptIsReadOnly +tidyGetOptionList +tidyGetParent +tidyGetPrev +tidyGetRoot +tidyInitInputBuffer +tidyInitOutputBuffer +tidyInitSink +tidyInitSource +tidyIsEOF +tidyLibraryVersion +tidyLoadConfig +tidyLoadConfigEnc +tidyLocalizedString +tidyLocalizedStringN +tidyNodeColumn +tidyNodeGetId +tidyNodeGetName +tidyNodeGetText +tidyNodeGetType +tidyNodeGetValue +tidyNodeHasText +tidyNodeIsHeader +tidyNodeIsProp +tidyNodeIsText +tidyNodeLine +tidyOptCopyConfig +tidyOptDiffThanDefault +tidyOptDiffThanSnapshot +tidyOptGetBool tidyOptGetCategory +tidyOptGetCurrPick +tidyOptGetDeclTagList tidyOptGetDefault -tidyOptGetDefaultInt tidyOptGetDefaultBool -tidyOptGetPickList +tidyOptGetDefaultInt +tidyOptGetDoc +tidyOptGetDocLinksList +tidyOptGetEncName +tidyOptGetId +tidyOptGetIdForName +tidyOptGetInt +tidyOptGetMutedMessageList +tidyOptGetName +tidyOptGetNextDeclTag +tidyOptGetNextDocLinks +tidyOptGetNextMutedMessage tidyOptGetNextPick +tidyOptGetNextPriorityAttr +tidyOptGetPickList +tidyOptGetPriorityAttrList +tidyOptGetType tidyOptGetValue -tidyOptSetValue +tidyOptIsReadOnly tidyOptParseValue -tidyOptGetInt -tidyOptSetInt -tidyOptGetBool -tidyOptSetBool -tidyOptResetToDefault tidyOptResetAllToDefault -tidyOptSnapshot +tidyOptResetToDefault tidyOptResetToSnapshot -tidyOptDiffThanDefault -tidyOptDiffThanSnapshot -tidyOptCopyConfig -tidyOptGetEncName -tidyOptGetCurrPick -tidyOptGetDeclTagList -tidyOptGetNextDeclTag -tidyInitSource -tidyGetByte -tidyUngetByte -tidyIsEOF -tidyInitSink -tidyPutByte -tidySetReportFilter -tidySetErrorFile -tidySetErrorBuffer -tidySetErrorSink -tidySetMallocCall -tidySetReallocCall -tidySetFreeCall -tidySetPanicCall +tidyOptSaveFile +tidyOptSaveSink +tidyOptSetBool +tidyOptSetInt +tidyOptSetValue +tidyOptSnapshot +tidyOptionIsList +tidyParseBuffer tidyParseFile +tidyParseSource tidyParseStdin tidyParseString -tidyParseBuffer -tidyParseSource -tidyCleanAndRepair +tidyPlatform +tidyPutByte +tidyRelease +tidyReleaseDate +tidyReportDoctype tidyRunDiagnostics +tidySaveBuffer tidySaveFile +tidySaveSink tidySaveStdout -tidySaveBuffer tidySaveString -tidySaveSink -tidyOptSaveFile -tidyOptSaveSink -tidyErrorSummary -tidyGeneralInfo -tidyGetRoot -tidyGetHtml -tidyGetHead -tidyGetBody -tidyGetParent -tidyGetChild -tidyGetNext -tidyGetPrev -tidyAttrFirst -tidyAttrNext -tidyAttrName -tidyAttrValue -tidyNodeGetType -tidyNodeGetName -tidyNodeIsText -tidyNodeIsProp -tidyNodeIsHeader -tidyNodeHasText -tidyNodeGetText -tidyNodeGetId -tidyNodeLine -tidyNodeColumn -tidyNodeIsHTML -tidyNodeIsHEAD -tidyNodeIsTITLE -tidyNodeIsBASE -tidyNodeIsMETA -tidyNodeIsBODY -tidyNodeIsFRAMESET -tidyNodeIsFRAME -tidyNodeIsIFRAME -tidyNodeIsNOFRAMES -tidyNodeIsHR -tidyNodeIsH1 -tidyNodeIsH2 -tidyNodeIsPRE -tidyNodeIsLISTING -tidyNodeIsP -tidyNodeIsUL -tidyNodeIsOL -tidyNodeIsDL -tidyNodeIsDIR -tidyNodeIsLI -tidyNodeIsDT -tidyNodeIsDD -tidyNodeIsTABLE -tidyNodeIsCAPTION -tidyNodeIsTD -tidyNodeIsTH -tidyNodeIsTR -tidyNodeIsCOL -tidyNodeIsCOLGROUP -tidyNodeIsBR -tidyNodeIsA -tidyNodeIsLINK -tidyNodeIsB -tidyNodeIsI -tidyNodeIsSTRONG -tidyNodeIsEM -tidyNodeIsBIG -tidyNodeIsSMALL -tidyNodeIsPARAM -tidyNodeIsOPTION -tidyNodeIsOPTGROUP -tidyNodeIsIMG -tidyNodeIsMAP -tidyNodeIsAREA -tidyNodeIsNOBR -tidyNodeIsWBR -tidyNodeIsFONT -tidyNodeIsLAYER -tidyNodeIsSPACER -tidyNodeIsCENTER -tidyNodeIsSTYLE -tidyNodeIsSCRIPT -tidyNodeIsNOSCRIPT -tidyNodeIsFORM -tidyNodeIsTEXTAREA -tidyNodeIsBLOCKQUOTE -tidyNodeIsAPPLET -tidyNodeIsOBJECT -tidyNodeIsDIV -tidyNodeIsSPAN -tidyNodeIsINPUT -tidyNodeIsQ -tidyNodeIsLABEL -tidyNodeIsH3 -tidyNodeIsH4 -tidyNodeIsH5 -tidyNodeIsH6 -tidyNodeIsADDRESS -tidyNodeIsXMP -tidyNodeIsSELECT -tidyNodeIsBLINK -tidyNodeIsMARQUEE -tidyNodeIsEMBED -tidyNodeIsBASEFONT -tidyNodeIsISINDEX -tidyNodeIsS -tidyNodeIsSTRIKE -tidyNodeIsU -tidyNodeIsMENU -tidyAttrGetId -tidyAttrIsEvent -tidyAttrIsProp -tidyAttrIsHREF -tidyAttrIsSRC -tidyAttrIsID -tidyAttrIsNAME -tidyAttrIsSUMMARY -tidyAttrIsALT -tidyAttrIsLONGDESC -tidyAttrIsUSEMAP -tidyAttrIsISMAP -tidyAttrIsLANGUAGE -tidyAttrIsTYPE -tidyAttrIsVALUE -tidyAttrIsCONTENT -tidyAttrIsTITLE -tidyAttrIsXMLNS -tidyAttrIsDATAFLD -tidyAttrIsWIDTH -tidyAttrIsHEIGHT -tidyAttrIsFOR -tidyAttrIsSELECTED -tidyAttrIsCHECKED -tidyAttrIsLANG -tidyAttrIsTARGET -tidyAttrIsHTTP_EQUIV -tidyAttrIsREL -tidyAttrIsOnMOUSEMOVE -tidyAttrIsOnMOUSEDOWN -tidyAttrIsOnMOUSEUP -tidyAttrIsOnCLICK -tidyAttrIsOnMOUSEOVER -tidyAttrIsOnMOUSEOUT -tidyAttrIsOnKEYDOWN -tidyAttrIsOnKEYUP -tidyAttrIsOnKEYPRESS -tidyAttrIsOnFOCUS -tidyAttrIsOnBLUR -tidyAttrIsBGCOLOR -tidyAttrIsLINK -tidyAttrIsALINK -tidyAttrIsVLINK -tidyAttrIsTEXT -tidyAttrIsSTYLE -tidyAttrIsABBR -tidyAttrIsCOLSPAN -tidyAttrIsROWSPAN -tidyAttrGetHREF -tidyAttrGetSRC -tidyAttrGetID -tidyAttrGetNAME -tidyAttrGetSUMMARY -tidyAttrGetALT -tidyAttrGetLONGDESC -tidyAttrGetUSEMAP -tidyAttrGetISMAP -tidyAttrGetLANGUAGE -tidyAttrGetTYPE -tidyAttrGetVALUE -tidyAttrGetCONTENT -tidyAttrGetTITLE -tidyAttrGetXMLNS -tidyAttrGetDATAFLD -tidyAttrGetWIDTH -tidyAttrGetHEIGHT -tidyAttrGetFOR -tidyAttrGetSELECTED -tidyAttrGetCHECKED -tidyAttrGetLANG -tidyAttrGetTARGET -tidyAttrGetHTTP_EQUIV -tidyAttrGetREL -tidyAttrGetOnMOUSEMOVE -tidyAttrGetOnMOUSEDOWN -tidyAttrGetOnMOUSEUP -tidyAttrGetOnCLICK -tidyAttrGetOnMOUSEOVER -tidyAttrGetOnMOUSEOUT -tidyAttrGetOnKEYDOWN -tidyAttrGetOnKEYUP -tidyAttrGetOnKEYPRESS -tidyAttrGetOnFOCUS -tidyAttrGetOnBLUR -tidyAttrGetBGCOLOR -tidyAttrGetLINK -tidyAttrGetALINK -tidyAttrGetVLINK -tidyAttrGetTEXT -tidyAttrGetSTYLE -tidyAttrGetABBR -tidyAttrGetCOLSPAN -tidyAttrGetROWSPAN +tidySetAppData +tidySetCharEncoding +tidySetConfigCallback +tidySetConfigChangeCallback +tidySetEmacsFile +tidySetErrorBuffer +tidySetErrorFile +tidySetErrorSink +tidySetFreeCall +tidySetInCharEncoding +tidySetLanguage +tidySetMallocCall +tidySetMessageCallback +tidySetOptionCallback +tidySetOutCharEncoding +tidySetPanicCall +tidySetPrettyPrinterCallback +tidySetReallocCall +tidySetReportCallback +tidySetReportFilter +tidyStatus +tidyUngetByte +tidyWarningCount |