diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-03 13:30:30 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-03 13:30:30 +0000 |
| commit | 60ca728e2e754338c26c4484826d237791750685 (patch) | |
| tree | 54339d2d3e2672cc8b8d556d54d5ab62c5036928 /webkit/pending | |
| parent | c3db21ff3446ac6bbb2d785c2441d0e5d5824bf5 (diff) | |
| download | chromium_src-60ca728e2e754338c26c4484826d237791750685.zip chromium_src-60ca728e2e754338c26c4484826d237791750685.tar.gz chromium_src-60ca728e2e754338c26c4484826d237791750685.tar.bz2 | |
Use the trunk WebKit method of disabling static constructors on
AtomicString.cpp. We still can't unfork this file because we disable some
extra JSC-only stuff.
Review URL: http://codereview.chromium.org/6428
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2827 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/pending')
| -rw-r--r-- | webkit/pending/AtomicString.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/pending/AtomicString.cpp b/webkit/pending/AtomicString.cpp index c9ccb0a..ccadfce 100644 --- a/webkit/pending/AtomicString.cpp +++ b/webkit/pending/AtomicString.cpp @@ -20,7 +20,7 @@ #include "config.h" -#ifdef AVOID_STATIC_CONSTRUCTORS +#ifdef SKIP_STATIC_CONSTRUCTORS_ON_GCC #define ATOMICSTRING_HIDE_GLOBALS 1 #endif @@ -273,6 +273,7 @@ AtomicString::operator UString() const return m_string; } #endif + DEFINE_GLOBAL(AtomicString, nullAtom) DEFINE_GLOBAL(AtomicString, emptyAtom, "") DEFINE_GLOBAL(AtomicString, textAtom, "#text") |