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

ports/netcat/nacl.patch

 diff --git a/src/Makefile.in b/src/Makefile.in
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 @@ -161,6 +161,7 @@ netcat_SOURCES = \
  
  
  netcat_LDADD = @CONTRIBLIBS@ @INTLLIBS@
 +netcat_PPAPI = -lppapi_simple -lnacl_io -lppapi
  
  EXTRA_DIST = *.h
@@ skipping 41 matching lines @@
 -  rand = 1;                            /* simulates a random number */
 +  randv = 1;                           /* simulates a random number */
  #endif
  
    /* loop until we find the specified flag */
 -  while (rand--)
 +  while (randv--)
      ret = netcat_flag_next(ret);
  
    /* don't return this same flag again */
-diff --git a/src/netcat.c b/src/netcat.c
---- a/src/netcat.c
-+++ b/src/netcat.c
-@@ -135,7 +135,11 @@ static void ncexec(nc_sock_t *ncsock)
- 
- /* main: handle command line arguments and listening status */
- 
-+#if defined(__native_client__)
-+int nacl_ppapi_main(int argc, char *argv[])
-+#else
- int main(int argc, char *argv[])
-+#endif
- {
-   int c, glob_ret = EXIT_FAILURE;
-   int total_ports, left_ports, accept_ret = -1, connect_ret = -1;
-@@ -616,3 +620,8 @@ int main(int argc, char *argv[])
-   netcat_printstats(FALSE);
-   return glob_ret;
- }                              /* end of main() */
-+
-+#if defined(__native_client__)
-+#include "ppapi_simple/ps_main.h"
-+PPAPI_SIMPLE_REGISTER_MAIN(nacl_ppapi_main)
-+#endif
 diff --git a/src/udphelper.c b/src/udphelper.c
 --- a/src/udphelper.c
 +++ b/src/udphelper.c
 @@ -30,7 +30,9 @@
  
  #ifndef USE_PKTINFO
  #include <sys/ioctl.h>
 -#include <net/if.h>
 +#if !defined(__native_client__) || defined(__GLIBC__)
 +# include <net/if.h>
@@ skipping 16 matching lines @@
    int *my_sockbuf = NULL, my_sockbuf_max = 0, sock_total = 0;
    unsigned int if_pos = 0;
 @@ -279,6 +288,7 @@ int udphelper_sockets_open(int **sockbuf, in_port_t nport)
    errno = ret;
  
    return -1;
 +#endif
  }
  
  #endif /* USE_PKTINFO */