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

ports/xorg-server/nacl.patch

 diff --git a/Xext/shm.c b/Xext/shm.c
 --- a/Xext/shm.c
 +++ b/Xext/shm.c
 @@ -33,8 +33,10 @@ in this Software without prior written authorization from The Open Group.
  #endif
  
  #include <sys/types.h>
 +#if !defined(__native_client__) || !defined(_NEWLIB_VERSION)
  #include <sys/ipc.h>
  #include <sys/shm.h>
@@ skipping 57 matching lines @@
  hw/kdrive/fbdev/Makefile
  hw/kdrive/linux/Makefile
  hw/kdrive/src/Makefile
 +hw/kdrive/sdl/Makefile
  test/Makefile
  test/xi2/Makefile
  xserver.ent
 diff --git a/dix/main.c b/dix/main.c
 --- a/dix/main.c
 +++ b/dix/main.c
-@@ -117,6 +117,10 @@ Equipment Corporation.
- 
- extern void Dispatch(void);
- 
-+#if defined(__native_client__)
-+# include "nacl_main.h"
-+#endif
-+
- #ifdef XQUARTZ
- #include <pthread.h>
- 
 @@ -130,11 +134,24 @@ int
  dix_main(int argc, char *argv[], char *envp[])
  #else
  int
 +# if defined(__native_client__)
 +__attribute__ (( visibility("default") ))
 +main(int argc, char *argv[])
 +# else
  main(int argc, char *argv[], char *envp[])
 +# endif
@@ skipping 250 matching lines @@
          /* remove the temporary file */
          unlink(tmpname);
  #endif
      }
      else {
 -#ifndef WIN32
 +#if !defined(WIN32) && !defined(__native_client__)
          LogMessage(X_ERROR, "XKB: Could not invoke xkbcomp\n");
  #else
          LogMessage(X_ERROR, "Could not open file %s\n", tmpname);