third_party/libevent/chromium.patch - Issue 6801008: Websocket to TCP proxy running in a separate thread (only on ChromeOS).

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/libevent/chromium.patch

Issue 6801008: Websocket to TCP proxy running in a separate thread (only on ChromeOS). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: g Created 9 years, 8 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
	1 diff --git a/third_party/libevent/evdns.h b/third_party/libevent/evdns.h

	2 index 1eb5c38..fca4ac3 100644

	3 --- a/third_party/libevent/evdns.h

	4 +++ b/third_party/libevent/evdns.h

	5 @@ -165,7 +165,7 @@ extern "C" {

	6 #endif

	7

	8 /* For integer types. */

	9 -#include <evutil.h>

	10 +#include "evutil.h"

	11

	12 /** Error codes 0-5 are as described in RFC 1035. */

	13 #define DNS_ERR_NONE 0

1 diff --git a/third_party/libevent/event-config.h b/third_party/libevent/event-co nfig.h	14 diff --git a/third_party/libevent/event-config.h b/third_party/libevent/event-co nfig.h

2 new file mode 100644	15 new file mode 100644

3 index 0000000..78a4727	16 index 0000000..78a4727

4 --- /dev/null	17 --- /dev/null

5 +++ b/third_party/libevent/event-config.h	18 +++ b/third_party/libevent/event-config.h

6 @@ -0,0 +1,16 @@	19 @@ -0,0 +1,16 @@

7 +// Copyright (c) 2009 The Chromium Authors. All rights reserved.	20 +// Copyright (c) 2009 The Chromium Authors. All rights reserved.

8 +// Use of this source code is governed by a BSD-style license that can be	21 +// Use of this source code is governed by a BSD-style license that can be

9 +// found in the LICENSE file.	22 +// found in the LICENSE file.

10 +	23 +

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
48 +++ b/third_party/libevent/evutil.h	61 +++ b/third_party/libevent/evutil.h

49 @@ -38,7 +38,7 @@	62 @@ -38,7 +38,7 @@

50 extern "C" {	63 extern "C" {

51 #endif	64 #endif

52	65

53 -#include <event-config.h>	66 -#include <event-config.h>

54 +#include "event-config.h"	67 +#include "event-config.h"

55 #ifdef _EVENT_HAVE_SYS_TIME_H	68 #ifdef _EVENT_HAVE_SYS_TIME_H

56 #include <sys/time.h>	69 #include <sys/time.h>

57 #endif	70 #endif

OLD	NEW

« chrome/browser/chromeos/webproxy_task.cc ('K') | « content/browser/browser_thread.cc ('k') | third_party/libevent/evdns.h » ('j') | third_party/libevent/evdns.h » ('J')