Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc

Issue 24649002: Clean up a few more unused globals. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: thestig comment Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "native_client/src/trusted/platform_qualify/nacl_os_qualify.h" 5 #include "native_client/src/trusted/platform_qualify/nacl_os_qualify.h"
6 #include "ppapi/native_client/src/trusted/plugin/nexe_arch.h" 6 #include "ppapi/native_client/src/trusted/plugin/nexe_arch.h"
7 7
8 namespace {
9 // The list of supported ISA strings for x86. See issue: 8 // The list of supported ISA strings for x86. See issue:
10 // http://code.google.com/p/nativeclient/issues/detail?id=1040 for more 9 // http://code.google.com/p/nativeclient/issues/detail?id=1040 for more
11 // information. Note that these string are to be case-insensitive compared. 10 // information. Note that these string are to be case-insensitive compared.
12 const char* const kNexeArchX86_32 = "x86-32"; 11 const char kNexeArchX86_64[] = "x86-64";
13 const char* const kNexeArchX86_64 = "x86-64"; 12 #if !((NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 && NACL_BUILD_SUBARCH == 64) && \
14 } // namespace 13 (defined(NACL_LINUX) || defined(NACL_OSX)))
14 const char kNexeArchX86_32[] = "x86-32";
15 #endif
15 16
16 namespace plugin { 17 namespace plugin {
17 const char* GetSandboxISA() { 18 const char* GetSandboxISA() {
18 #if (NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 && NACL_BUILD_SUBARCH == 64) && \ 19 #if (NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 && NACL_BUILD_SUBARCH == 64) && \
19 (defined(NACL_LINUX) || defined(NACL_OSX)) 20 (defined(NACL_LINUX) || defined(NACL_OSX))
20 return kNexeArchX86_64; // 64-bit Linux or Mac. 21 return kNexeArchX86_64; // 64-bit Linux or Mac.
21 #else 22 #else
22 return NaClOsIs64BitWindows() == 1 23 return NaClOsIs64BitWindows() == 1
23 ? kNexeArchX86_64 // 64-bit Windows (Chrome, Firefox) 24 ? kNexeArchX86_64 // 64-bit Windows (Chrome, Firefox)
24 : kNexeArchX86_32; // everything else. 25 : kNexeArchX86_32; // everything else.
25 #endif 26 #endif
26 } 27 }
27 } // namespace plugin 28 } // namespace plugin
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698