Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Unified Diff: ports/xorg-server/nacl.patch

Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ports/twm/build.sh ('K') | « ports/xorg-server/build.sh ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/xorg-server/nacl.patch
diff --git a/ports/xorg-server/nacl.patch b/ports/xorg-server/nacl.patch
index b782fe894f1d9067e8c6392568239efdf7ea8a51..797bd85934925555c9ee08ac87e388f38fa75480 100644
--- a/ports/xorg-server/nacl.patch
+++ b/ports/xorg-server/nacl.patch
@@ -75,17 +75,6 @@ diff --git a/configure.ac b/configure.ac
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
« ports/twm/build.sh ('K') | « ports/xorg-server/build.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698