summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorcraig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-11 04:36:05 +0000
committercraig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-11 04:36:05 +0000
commit4c66d2a859776c05767f05472cbfa9519ca01aff (patch)
tree4ba514f08aedb79783bc19e7c31ca1de82552ea7 /app
parent0b330bf9a3164dc61ce4b88c386e44c36e7bfa60 (diff)
downloadchromium_src-4c66d2a859776c05767f05472cbfa9519ca01aff.zip
chromium_src-4c66d2a859776c05767f05472cbfa9519ca01aff.tar.gz
chromium_src-4c66d2a859776c05767f05472cbfa9519ca01aff.tar.bz2
Linux: fix compilation error with gcc 4.5.
Avoid a gcc 4.5 warning/error for values that aren't part of NPNVariable. Also drop some unnecessary static_casts by swapping from an int to a size_t in TemplateURLRef's Replacement struct and use platform specific NULL or 0 constants in a couple of places. BUG=43341 TEST=chrome target compiles with gcc 4.5. Review URL: http://codereview.chromium.org/2019002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/clipboard/clipboard_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/clipboard/clipboard_unittest.cc b/app/clipboard/clipboard_unittest.cc
index d15247b..89702f1 100644
--- a/app/clipboard/clipboard_unittest.cc
+++ b/app/clipboard/clipboard_unittest.cc
@@ -232,7 +232,7 @@ TEST_F(ClipboardTest, SharedBitmapTest) {
ASSERT_TRUE(shared_buf.Map(bytes));
memcpy(shared_buf.memory(), fake_bitmap, bytes);
base::SharedMemoryHandle handle_to_share;
- base::ProcessHandle current_process = NULL;
+ base::ProcessHandle current_process = base::kNullProcessHandle;
#if defined(OS_WIN)
current_process = GetCurrentProcess();
#endif