Changeset 55524 in webkit


Ignore:
Timestamp:
Mar 4, 2010 7:03:16 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-03-04 Fridrich Strba <​fridrich.strba@bluewin.ch>

Reviewed by Holger Freyther.

​https://bugs.webkit.org/show_bug.cgi?id=35726
Remove orphaned #ifdef WTF_USE_GLIB_ICU_UNICODE_HYBRID

Removing orphaned #if USE.

  • GNUmakefile.am:

2010-03-04 Fridrich Strba <​fridrich.strba@bluewin.ch>

Reviewed by Holger Freyther.

​https://bugs.webkit.org/show_bug.cgi?id=35726
Remove orphaned #ifdef WTF_USE_GLIB_ICU_UNICODE_HYBRID

Removing orphaned #if USE.

  • platform/ThreadGlobalData.h:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r55520 r55524  
     12010-03-04  Fridrich Strba  <fridrich.strba@bluewin.ch>
     2
     3        Reviewed by Holger Freyther.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=35726
     6        Remove orphaned #ifdef WTF_USE_GLIB_ICU_UNICODE_HYBRID
     7
     8        Removing orphaned #if USE.
     9
     10        * GNUmakefile.am:
     11
    1122010-03-04  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
    213

  • trunk/GNUmakefile.am

    r55457 r55524  
    273273
    274274if USE_GLIB_UNICODE
    275 # https://bugs.webkit.org/show_bug.cgi?id=15914
    276 # In patch 1/4 we are compiling a hybrid version of GLib WTF Unicode
    277 # functionality mixed with ICU-based text codecs and TextBreakIterator.
    278 # For the transition, introducing an interim HYBRID macro.
    279 # This macro is required for compiling WTF with GLib Unicode backend,
    280 # but at the same time keeping ICU dependency for codecs and break iterator.
    281 # It will be removed with patch 3/4 of the above bug.
    282275global_cppflags += \
    283         -DWTF_USE_GLIB_UNICODE=1 \
    284         -DWTF_USE_GLIB_ICU_UNICODE_HYBRID=1
     276        -DWTF_USE_GLIB_UNICODE=1
    285277endif
    286278

  • trunk/WebCore/ChangeLog

    r55523 r55524  
     12010-03-04  Fridrich Strba  <fridrich.strba@bluewin.ch>
     2
     3        Reviewed by Holger Freyther.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=35726
     6        Remove orphaned #ifdef WTF_USE_GLIB_ICU_UNICODE_HYBRID
     7
     8        Removing orphaned #if USE.
     9
     10        * platform/ThreadGlobalData.h:
     11
    1122010-03-03  Jeremy Orlow  <jorlow@chromium.org>
    213

  • trunk/WebCore/platform/ThreadGlobalData.h

    r53514 r55524  
    5656        ThreadTimers& threadTimers() { return *m_threadTimers; }
    5757
    58 #if USE(ICU_UNICODE) || USE(GLIB_ICU_UNICODE_HYBRID)
     58#if USE(ICU_UNICODE)
    5959        ICUConverterWrapper& cachedConverterICU() { return *m_cachedConverterICU; }
    6060#endif
    … …  
    7474#endif
    7575
    76 #if USE(ICU_UNICODE) || USE(GLIB_ICU_UNICODE_HYBRID)
     76#if USE(ICU_UNICODE)
    7777        ICUConverterWrapper* m_cachedConverterICU;
    7878#endif
Note: See TracChangeset for help on using the changeset viewer.