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

Unified Diff: ports/libevent/nacl.patch

Issue 1311703003: Added Tor Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « ports/libevent/build.sh ('k') | ports/libevent/pkg_info » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/libevent/nacl.patch
diff --git a/ports/libevent/nacl.patch b/ports/libevent/nacl.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2287a58af37806a7a81888add61b5bb4004cb56c
--- /dev/null
+++ b/ports/libevent/nacl.patch
@@ -0,0 +1,64 @@
+diff --git a/evutil.c b/evutil.c
+--- a/evutil.c
++++ b/evutil.c
+@@ -183,9 +183,15 @@ int
+ evutil_socketpair(int family, int type, int protocol, evutil_socket_t fd[2])
+ {
+ #ifndef WIN32
+- return socketpair(family, type, protocol, fd);
++ #ifdef __native_client__
++ // nacl.io lacks socketpair implementation.
++ // TODO(dt) remove this once socketpair is available on nacl.io
++ return evutil_ersatz_socketpair(family, type, protocol, fd);
++ #else
++ return socketpair(family, type, protocol, fd);
++ #endif
+ #else
+- return evutil_ersatz_socketpair(family, type, protocol, fd);
++ return evutil_ersatz_socketpair(family, type, protocol, fd);
+ #endif
+ }
+
+@@ -2187,4 +2193,3 @@ evutil_load_windows_system_library(const TCHAR *library_name)
+ return LoadLibrary(path);
+ }
+ #endif
+-
+diff --git a/sample/hello-world.c b/sample/hello-world.c
+--- a/sample/hello-world.c
++++ b/sample/hello-world.c
+@@ -66,14 +66,19 @@ main(int argc, char **argv)
+ if (!listener) {
+ fprintf(stderr, "Could not create a listener!\n");
+ return 1;
+- }
++ } else {
++ printf("\n listening on port %d\n",PORT);
++ }
+
++// nacl_io don't support signals
++#ifndef __native_client__
+ signal_event = evsignal_new(base, SIGINT, signal_cb, (void *)base);
+
+ if (!signal_event || event_add(signal_event, NULL)<0) {
+ fprintf(stderr, "Could not create/add a signal event!\n");
+ return 1;
+ }
++#endif
+
+ event_base_dispatch(base);
+
+@@ -129,6 +134,8 @@ conn_eventcb(struct bufferevent *bev, short events, void *user_data)
+ bufferevent_free(bev);
+ }
+
++// nacl_io don't support signals
++#ifndef __native_client__
+ static void
+ signal_cb(evutil_socket_t sig, short events, void *user_data)
+ {
+@@ -139,3 +146,4 @@ signal_cb(evutil_socket_t sig, short events, void *user_data)
+
+ event_base_loopexit(base, &delay);
+ }
++#endif
« no previous file with comments | « ports/libevent/build.sh ('k') | ports/libevent/pkg_info » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698