| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The Native Client Authors. All rights reserved. | 2 * Copyright (c) 2013 The Native Client Authors. All rights reserved. |
| 3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
| 4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
| 5 */ | 5 */ |
| 6 | 6 |
| 7 // TODO(bradnelson): Find a better workaround. | 7 // TODO(bradnelson): Find a better workaround. |
| 8 #define NACL_SKIP_GETOPT | 8 #define NACL_SKIP_GETOPT |
| 9 | 9 |
| 10 #include "nacl_main.h" | 10 #include "nacl_main.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 return "It's a lisp misc!"; | 50 return "It's a lisp misc!"; |
| 51 else if (VECTORLIKEP(object)) | 51 else if (VECTORLIKEP(object)) |
| 52 return "It's some kind of vector like thingie!"; | 52 return "It's some kind of vector like thingie!"; |
| 53 else | 53 else |
| 54 return "I don't know what it is."; | 54 return "I don't know what it is."; |
| 55 } | 55 } |
| 56 | 56 |
| 57 // The special NaCl entry point into emacs. | 57 // The special NaCl entry point into emacs. |
| 58 extern int nacl_emacs_main(int argc, char* argv[]); | 58 extern int nacl_emacs_main(int argc, char* argv[]); |
| 59 | 59 |
| 60 int nacl_main(int argc, char* argv[]) { | 60 int main(int argc, char* argv[]) { |
| 61 if (nacl_startup_untar(argv[0], "emacs.tar", "/")) | 61 if (nacl_startup_untar(argv[0], "emacs.tar", "/")) |
| 62 return 1; | 62 return 1; |
| 63 return nacl_emacs_main(argc, argv); | 63 return nacl_emacs_main(argc, argv); |
| 64 } | 64 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1417223003:
Switch from using 'nacl_main' to 'main' entry point (Closed)
Base URL: https://chromium.googlesource.com/external/naclports.git@master