summaryrefslogtreecommitdiffstats
path: root/chrome/nacl
diff options
context:
space:
mode:
authorgregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-25 23:17:09 +0000
committergregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-25 23:17:09 +0000
commit3b32fa66e6260cc1cacd1c6c5f95b5bae6237f87 (patch)
treedf6034fc71d3b11cb2ad95a490fc03d809ace175 /chrome/nacl
parent6e77aee61f940b1732823bf586a759bbf72ff9d2 (diff)
downloadchromium_src-3b32fa66e6260cc1cacd1c6c5f95b5bae6237f87.zip
chromium_src-3b32fa66e6260cc1cacd1c6c5f95b5bae6237f87.tar.gz
chromium_src-3b32fa66e6260cc1cacd1c6c5f95b5bae6237f87.tar.bz2
64-bit Windows support for NaCl: update NaCl revision in Chrome, enable the 64-bit loader code and fix some build issues.
Review URL: http://codereview.chromium.org/651065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
-rw-r--r--chrome/nacl/sel_main.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/nacl/sel_main.cc b/chrome/nacl/sel_main.cc
index 4a2427b..5086d1e 100644
--- a/chrome/nacl/sel_main.cc
+++ b/chrome/nacl/sel_main.cc
@@ -54,10 +54,6 @@ static void StopForDebuggerInit(const struct NaClApp *state) {
}
int SelMain(const int desc, const NaClHandle handle) {
-#ifdef _WIN64
- /* TODO(gregoryd): remove this when NaCl's service_runtime supports Win64 */
- return 0;
-#else
char *av[1];
int ac = 1;
@@ -204,6 +200,5 @@ int SelMain(const int desc, const NaClHandle handle) {
NaClAllModulesFini();
return ret_code;
-#endif
}