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

ports/vim/nacl.patch

 diff --git a/src/Makefile b/src/Makefile
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -1737,7 +1737,7 @@ $(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h
                 sh $(srcdir)/link.sh
  
  xxd/xxd$(EXEEXT): xxd/xxd.c
 -       cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 +       cd xxd; CC="$(CC)" EXEEXT="$(EXEEXT)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
                 $(MAKE) -f Makefile
@@ skipping 25 matching lines @@
 +#  else
 +#    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +#$as_echo "no" >&6; }
 +#  fi
  fi
  
  
 diff --git a/src/main.c b/src/main.c
 --- a/src/main.c
 +++ b/src/main.c
-@@ -14,6 +14,11 @@
+@@ -14,6 +14,10 @@
  # include <spawno.h>           /* special MS-DOS swapping library */
  #endif
  
 +#ifdef __native_client__
 +#include <nacl_main.h>
-+#define main nacl_main
 +#endif
 +
  #ifdef __CYGWIN__
  # ifndef WIN32
  #  include <cygwin/version.h>
-@@ -165,6 +170,11 @@ main
+@@ -165,6 +169,11 @@ main
      int                argc;
      char       **argv;
  {
 +#ifdef __native_client__
 +    if (nacl_startup_untar(argv[0], "vim.tar", "/"))
 +        return 1;
 +#endif
 +
      char_u     *fname = NULL;          /* file name from command line */
      mparm_T    params;                 /* various parameters passed between
@@ skipping 17 matching lines @@
 @@ -1,7 +1,7 @@
  # The most simplistic Makefile
  
 -xxd: xxd.c
 -       $(CC) $(CFLAGS) $(LDFLAGS) -DUNIX -o xxd xxd.c
 +xxd$(EXEEXT): xxd.c
 +       $(CC) $(CFLAGS) $(LDFLAGS) -DUNIX -o xxd$(EXEEXT) xxd.c
  
  clean:
         rm -f xxd xxd.o