Changeset 180125 in webkit
- Timestamp:
- Feb 14, 2015 11:52:39 PM (9 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r180123 r180125 1 2015-02-14 Alexey Proskuryakov <ap@apple.com> 2 3 More internal build fixing. 4 5 DDDFACache.h is not an actual private header, so we were using open source 6 redeclaration of DDDFACacheRef with an internal function prototype from DDDFAScanner.h. 7 8 * platform/cocoa/TelephoneNumberDetectorCocoa.cpp: 9 (WebCore::TelephoneNumberDetector::phoneNumbersScanner): 10 1 11 2015-02-14 Benjamin Poulain <benjamin@webkit.org> 2 12 -
trunk/Source/WebCore/platform/cocoa/TelephoneNumberDetectorCocoa.cpp
r164569 r180125 31 31 #include "SoftLinking.h" 32 32 33 #ifdef __has_include34 #if __has_include(<DataDetectorsCore/DDDFACache.h>)35 #include <DataDetectorsCore/DDDFACache.h>36 #else37 typedef void* DDDFACacheRef;38 #endif39 40 33 #if __has_include(<DataDetectorsCore/DDDFAScanner.h>) 41 34 #include <DataDetectorsCore/DDDFAScanner.h> 42 35 #else 43 typedef void* DDDFAScannerRef; 36 typedef struct __DDDFAScanner DDDFAScanner, * DDDFAScannerRef; 37 struct __DDDFACache; 44 38 #endif 45 39 #endif 46 40 47 41 SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(DataDetectorsCore) 48 SOFT_LINK(DataDetectorsCore, DDDFACacheCreateFromFramework, DDDFACacheRef, (), ())49 SOFT_LINK(DataDetectorsCore, DDDFAScannerCreateFromCache, DDDFAScannerRef, ( DDDFACacheRefcache), (cache))42 SOFT_LINK(DataDetectorsCore, DDDFACacheCreateFromFramework, struct __DDDFACache*, (), ()) 43 SOFT_LINK(DataDetectorsCore, DDDFAScannerCreateFromCache, DDDFAScannerRef, (struct __DDDFACache* cache), (cache)) 50 44 SOFT_LINK(DataDetectorsCore, DDDFAScannerFirstResultInUnicharArray, Boolean, (DDDFAScannerRef scanner, const UniChar* str, unsigned length, int* startPos, int* endPos), (scanner, str, length, startPos, endPos)) 51 45 … … 58 52 return nullptr; 59 53 60 static DDDFACacheRefcache = DDDFACacheCreateFromFramework();54 static struct __DDDFACache* cache = DDDFACacheCreateFromFramework(); 61 55 if (!cache) 62 56 return nullptr;
Note: See TracChangeset
for help on using the changeset viewer.