diff options
| author | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 16:27:18 +0000 |
|---|---|---|
| committer | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 16:27:18 +0000 |
| commit | 8b8fab971151ba246c0930fa25c68b705f6a6c0b (patch) | |
| tree | 0c6a51a8823d8fa36636e16ffa5e85a480c8716d /ipc | |
| parent | 0d75bad6ecfdb9c7611f1001c5a1e9a0347b2337 (diff) | |
| download | chromium_src-8b8fab971151ba246c0930fa25c68b705f6a6c0b.zip chromium_src-8b8fab971151ba246c0930fa25c68b705f6a6c0b.tar.gz chromium_src-8b8fab971151ba246c0930fa25c68b705f6a6c0b.tar.bz2 | |
Linux: fix a bunch of NULL vs. 0 issues spotted by gcc 4.5.
There are more gcc 4.5 issues to be solved so GYP_DEFINES=='werror='
is still required to build with 4.5 even with these changes.
BUG=66652
TEST=compiles with gcc 4.5 and trybots
Review URL: http://codereview.chromium.org/6186008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_tests.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipc/ipc_tests.cc b/ipc/ipc_tests.cc index 7c0b718..93276f4 100644 --- a/ipc/ipc_tests.cc +++ b/ipc/ipc_tests.cc @@ -90,7 +90,7 @@ base::ProcessHandle IPCChannelTest::SpawnChild(ChildType child_type, fds_to_map.push_back(std::pair<int, int>(ipcfd, kPrimaryIPCChannel + 3)); } - base::ProcessHandle ret = NULL; + base::ProcessHandle ret = base::kNullProcessHandle; switch (child_type) { case TEST_CLIENT: ret = MultiProcessTest::SpawnChild("RunTestClient", @@ -123,7 +123,7 @@ base::ProcessHandle IPCChannelTest::SpawnChild(ChildType child_type, debug_on_start); break; default: - return NULL; + return base::kNullProcessHandle; break; } return ret; @@ -367,7 +367,7 @@ MULTIPROCESS_TEST_MAIN(RunTestClient) { // run message loop MessageLoop::current()->Run(); // return true; - return NULL; + return 0; } #endif // !PERFORMANCE_TEST |