summaryrefslogtreecommitdiffstats
path: root/chrome/nacl
diff options
context:
space:
mode:
authorjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-24 11:05:21 +0000
committerjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-24 11:05:21 +0000
commit86ec66596544ad8b248e482d4ac84a2b3a3b33fd (patch)
treedc420f08dcdeace86f8ca88b81415aa77ac913d4 /chrome/nacl
parent5a9bb8d6fad3df068fa8fe8301ca1685c0c66bb6 (diff)
downloadchromium_src-86ec66596544ad8b248e482d4ac84a2b3a3b33fd.zip
chromium_src-86ec66596544ad8b248e482d4ac84a2b3a3b33fd.tar.gz
chromium_src-86ec66596544ad8b248e482d4ac84a2b3a3b33fd.tar.bz2
revert r35237 since it causes Mac unit tests to fail.
"Split more targets from chrome.gyp to add support for building Native Client for 64-bit Windows. " BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/520006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
-rw-r--r--chrome/nacl/sel_main.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/nacl/sel_main.cc b/chrome/nacl/sel_main.cc
index 4a2427b..c1f56d6 100644
--- a/chrome/nacl/sel_main.cc
+++ b/chrome/nacl/sel_main.cc
@@ -8,10 +8,6 @@
#include <crt_externs.h>
#endif
-#ifdef _WIN64 /* TODO(gregoryd): remove this when win64 issues are fixed */
-#define NACL_NO_INLINE
-#endif
-
EXTERN_C_BEGIN
#include "native_client/src/shared/platform/nacl_sync.h"
#include "native_client/src/shared/platform/nacl_sync_checked.h"
@@ -54,10 +50,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 +196,5 @@ int SelMain(const int desc, const NaClHandle handle) {
NaClAllModulesFini();
return ret_code;
-#endif
}