Changeset 180125 in webkit


Ignore:
Timestamp:
Feb 14, 2015 11:52:39 PM (9 years ago)
Author:
ap@apple.com
Message:

More internal build fixing.

DDDFACache.h is not an actual private header, so we were using open source
redeclaration of DDDFACacheRef with an internal function prototype from DDDFAScanner.h.

  • platform/cocoa/TelephoneNumberDetectorCocoa.cpp:

(WebCore::TelephoneNumberDetector::phoneNumbersScanner):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r180123 r180125  
     12015-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
    1112015-02-14  Benjamin Poulain  <benjamin@webkit.org>
    212
  • trunk/Source/WebCore/platform/cocoa/TelephoneNumberDetectorCocoa.cpp

    r164569 r180125  
    3131#include "SoftLinking.h"
    3232
    33 #ifdef __has_include
    34 #if __has_include(<DataDetectorsCore/DDDFACache.h>)
    35 #include <DataDetectorsCore/DDDFACache.h>
    36 #else
    37 typedef void* DDDFACacheRef;
    38 #endif
    39 
    4033#if __has_include(<DataDetectorsCore/DDDFAScanner.h>)
    4134#include <DataDetectorsCore/DDDFAScanner.h>
    4235#else
    43 typedef void* DDDFAScannerRef;
     36typedef struct __DDDFAScanner DDDFAScanner, * DDDFAScannerRef;
     37struct __DDDFACache;
    4438#endif
    4539#endif
    4640
    4741SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(DataDetectorsCore)
    48 SOFT_LINK(DataDetectorsCore, DDDFACacheCreateFromFramework, DDDFACacheRef, (), ())
    49 SOFT_LINK(DataDetectorsCore, DDDFAScannerCreateFromCache, DDDFAScannerRef, (DDDFACacheRef cache), (cache))
     42SOFT_LINK(DataDetectorsCore, DDDFACacheCreateFromFramework, struct __DDDFACache*, (), ())
     43SOFT_LINK(DataDetectorsCore, DDDFAScannerCreateFromCache, DDDFAScannerRef, (struct __DDDFACache* cache), (cache))
    5044SOFT_LINK(DataDetectorsCore, DDDFAScannerFirstResultInUnicharArray, Boolean, (DDDFAScannerRef scanner, const UniChar* str, unsigned length, int* startPos, int* endPos), (scanner, str, length, startPos, endPos))
    5145
     
    5852        return nullptr;
    5953
    60     static DDDFACacheRef cache = DDDFACacheCreateFromFramework();
     54    static struct __DDDFACache* cache = DDDFACacheCreateFromFramework();
    6155    if (!cache)
    6256        return nullptr;
Note: See TracChangeset for help on using the changeset viewer.