diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-21 18:06:43 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-21 18:06:43 +0000 |
| commit | 666cc51ce6f60ef72284e20b3bc9e0cb2e397ec5 (patch) | |
| tree | 5c00f71ba52446880155a654e623b1d3c354025c /webkit | |
| parent | 2cd713f04f510f1454a757e870fc61fdd276a826 (diff) | |
| download | chromium_src-666cc51ce6f60ef72284e20b3bc9e0cb2e397ec5.zip chromium_src-666cc51ce6f60ef72284e20b3bc9e0cb2e397ec5.tar.gz chromium_src-666cc51ce6f60ef72284e20b3bc9e0cb2e397ec5.tar.bz2 | |
remove PLATFORM_GTK-isms
After the change to PlatformScrollbar.h, this just works (tm).
Review URL: http://codereview.chromium.org/7821
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/SConscript | 15 | ||||
| -rw-r--r-- | webkit/port/platform/chromium/PlatformScrollBar.h | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index 7e3fc34..77e4a1a 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -47,10 +47,6 @@ elif env['PLATFORM'] == 'posix': '-Wno-parentheses', ], CPPDEFINES = [ - 'BUILDING_GTK__', - # In Platform.h, this doesn't get defined when BUILDING_GTK__ is - # defined. - 'WTF_USE_ICU_UNICODE=1', # We want webkit to use pthreads rather than gthread. 'WTF_USE_PTHREADS=1', ], @@ -206,17 +202,6 @@ env.Append( ], ) -# For now, use the upstream platform/gtk directory while we get things -# compiling. We need to do this because some of the header files in our port -# assume windows (e.g., PlatformScrollBar.h). Eventually, we may need to fork -# this or make modifications to the header files. -if env['PLATFORM'] == 'posix': - env.Prepend( - CPPPATH = [ - '$WEBCORE_DIR/platform/gtk' - ] - ) - # This list is the SConscripts that work on Windows and Linux. sconscript_dirs = [ 'SConscript.port', diff --git a/webkit/port/platform/chromium/PlatformScrollBar.h b/webkit/port/platform/chromium/PlatformScrollBar.h index 5d2df22..bf865c5 100644 --- a/webkit/port/platform/chromium/PlatformScrollBar.h +++ b/webkit/port/platform/chromium/PlatformScrollBar.h @@ -178,4 +178,3 @@ private: } #endif // PlatformScrollbar_h - |