diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 16:38:22 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 16:38:22 +0000 |
| commit | 3cb95308104ebdba3027b54dd1051182def2f0a2 (patch) | |
| tree | 48c85c7924fe4968ce94034d78a8eccb12098f6b /chrome/nacl.gypi | |
| parent | 845ca3d65a75ab814900860886c3585d21e74a38 (diff) | |
| download | chromium_src-3cb95308104ebdba3027b54dd1051182def2f0a2.zip chromium_src-3cb95308104ebdba3027b54dd1051182def2f0a2.tar.gz chromium_src-3cb95308104ebdba3027b54dd1051182def2f0a2.tar.bz2 | |
Rename NaClThread to NaClLauncherThread
This avoids a conflict with NaCl's own "struct NaClThread".
NaClLauncherThread is also a more descriptive name.
The goal is to be able to #include NaCl's sel_ldr.h so that we do not
have to duplicate the prototype for NaClMainForChromium(). However,
we cannot do that immediately because there is still a conflict
between NaCl's LOG_FATAL and Chromium's LOG_FATAL.
BUG=http://code.google.com/p/nativeclient/issues/detail?id=1595
TEST=trybots
Review URL: http://codereview.chromium.org/6880074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index f125393..1d9ab38 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2009 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -28,8 +28,8 @@ 'nacl/nacl_main_platform_delegate_linux.cc', 'nacl/nacl_main_platform_delegate_mac.mm', 'nacl/nacl_main_platform_delegate_win.cc', - 'nacl/nacl_thread.cc', - 'nacl/nacl_thread.h', + 'nacl/nacl_launcher_thread.cc', + 'nacl/nacl_launcher_thread.h', ], # TODO(gregoryd): consider switching NaCl to use Chrome OS defines 'conditions': [ |