Switch from using 'nacl_main' to 'main' entry point

ports/ninja/nacl.patch

Index: ports/ninja/nacl.patch
diff --git a/ports/ninja/nacl.patch b/ports/ninja/nacl.patch
index 5517d47488caf03cf9e3d62292c60fc307f5c3c8..3fafca82d6aab390e2ae6657c02b3f1e2f606862 100644
--- a/ports/ninja/nacl.patch
+++ b/ports/ninja/nacl.patch
@@ -170,21 +170,6 @@ diff --git a/src/manifest_parser_perftest.cc b/src/manifest_parser_perftest.cc
  
    const int kNumRepetitions = 5;
    vector<int> times;
-diff --git a/src/ninja.cc b/src/ninja.cc
---- a/src/ninja.cc
-+++ b/src/ninja.cc
-@@ -42,6 +42,11 @@
- #include "util.h"
- #include "version.h"
- 
-+#if defined(__native_client__)
-+# include "nacl_main.h"
-+# define main nacl_main
-+#endif
-+
- #ifdef _MSC_VER
- // Defined in msvc_helper_main-win32.cc.
- int MSVCHelperMain(int argc, char** argv);
 diff --git a/src/ninja_test.cc b/src/ninja_test.cc
 --- a/src/ninja_test.cc
 +++ b/src/ninja_test.cc
@@ -196,22 +181,20 @@ diff --git a/src/ninja_test.cc b/src/ninja_test.cc
  
  #ifdef _WIN32
  #include "getopt.h"
-@@ -21,6 +22,14 @@
+@@ -21,6 +22,12 @@
  #include <getopt.h>
  #endif
  
 +#if defined(__native_client__)
 +#include <sys/stat.h>
 +#include <sys/mount.h>
-+#include "nacl_main.h"
 +#include "nacl_io/nacl_io.h"
-+#define main nacl_main
 +#endif
 +
  #include "test.h"
  #include "line_printer.h"
  
-@@ -123,6 +132,16 @@ bool testing::Test::Check(bool condition, const char* file, int line,
+@@ -123,6 +130,16 @@ bool testing::Test::Check(bool condition, const char* file, int line,
  }
  
  int main(int argc, char **argv) {
@@ -228,7 +211,7 @@ diff --git a/src/ninja_test.cc b/src/ninja_test.cc
    int tests_started = 0;
  
    const char* test_filter = "*";
-@@ -152,5 +171,8 @@ int main(int argc, char **argv) {
+@@ -152,5 +169,8 @@ int main(int argc, char **argv) {
    }
  
    printer.PrintOnNewLine(passed ? "passed\n" : "failed\n");