summaryrefslogtreecommitdiffstats
path: root/chrome/nacl
diff options
context:
space:
mode:
authorgregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 17:54:47 +0000
committergregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 17:54:47 +0000
commit62a1c682b84b896fd6123680b1307687a54c59c2 (patch)
treeddbd4495f918db5bf9b9d2cf6c00edd454125581 /chrome/nacl
parent69628c91347ac43e6cf21575c722358ef10f51bb (diff)
downloadchromium_src-62a1c682b84b896fd6123680b1307687a54c59c2.zip
chromium_src-62a1c682b84b896fd6123680b1307687a54c59c2.tar.gz
chromium_src-62a1c682b84b896fd6123680b1307687a54c59c2.tar.bz2
Remove the expiration check from Chrome code
BUG= http://code.google.com/p/nativeclient/issues/detail?id=119 TEST=none Review URL: http://codereview.chromium.org/410004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
-rw-r--r--chrome/nacl/sel_main.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/chrome/nacl/sel_main.cc b/chrome/nacl/sel_main.cc
index 82df9c3..e035f92 100644
--- a/chrome/nacl/sel_main.cc
+++ b/chrome/nacl/sel_main.cc
@@ -8,6 +8,8 @@
#include <crt_externs.h>
#endif
+#define NACL_NO_INLINE
+
EXTERN_C_BEGIN
#include "native_client/src/shared/platform/nacl_sync.h"
#include "native_client/src/shared/platform/nacl_sync_checked.h"
@@ -50,6 +52,8 @@ static void StopForDebuggerInit(const struct NaClApp *state) {
}
int SelMain(const int desc, const NaClHandle handle) {
+ return 0;
+#if 0 // TODO(gregoryd): enable when the service runtime is ready
char *av[1];
int ac = 1;
@@ -72,14 +76,6 @@ int SelMain(const int desc, const NaClHandle handle) {
envp = environ;
#endif
-
- if (NaClHasExpired()) {
- // TODO(gregoryd): report error to browser?
- fprintf(stderr, "This version of Native Client has expired.\n");
- fprintf(stderr, "Please visit: http://code.google.com/p/nativeclient/\n");
- exit(-1);
- }
-
NaClAllModulesInit();
/* used to be -P */
@@ -204,5 +200,6 @@ int SelMain(const int desc, const NaClHandle handle) {
NaClAllModulesFini();
return ret_code;
+#endif
}