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:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@55524
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+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 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Reviewed by Tor Arne Vestbø.
endif
if USE_GLIB_UNICODE
-# https://bugs.webkit.org/show_bug.cgi?id=15914
-# In patch 1/4 we are compiling a hybrid version of GLib WTF Unicode
-# functionality mixed with ICU-based text codecs and TextBreakIterator.
-# For the transition, introducing an interim HYBRID macro.
-# This macro is required for compiling WTF with GLib Unicode backend,
-# but at the same time keeping ICU dependency for codecs and break iterator.
-# It will be removed with patch 3/4 of the above bug.
global_cppflags += \
- -DWTF_USE_GLIB_UNICODE=1 \
- -DWTF_USE_GLIB_ICU_UNICODE_HYBRID=1
+ -DWTF_USE_GLIB_UNICODE=1
endif
if !ENABLE_FAST_MALLOC
+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:
+
2010-03-03 Jeremy Orlow <jorlow@chromium.org>
Reviewed by Darin Fisher.
HashSet<StringImpl*>& atomicStringTable() { return *m_atomicStringTable; }
ThreadTimers& threadTimers() { return *m_threadTimers; }
-#if USE(ICU_UNICODE) || USE(GLIB_ICU_UNICODE_HYBRID)
+#if USE(ICU_UNICODE)
ICUConverterWrapper& cachedConverterICU() { return *m_cachedConverterICU; }
#endif
bool m_isMainThread;
#endif
-#if USE(ICU_UNICODE) || USE(GLIB_ICU_UNICODE_HYBRID)
+#if USE(ICU_UNICODE)
ICUConverterWrapper* m_cachedConverterICU;
#endif