Chromium Code Reviews Chromium Code Reviews
Issue 412006:
posix: upgrade libevent from 1.4.7 to 1.4.13 (Closed)
| OLD | NEW |
|---|---|
| (Empty) | |
| 1 diff --git a/third_party/libevent/event-config.h b/third_party/libevent/event-co nfig.h | |
| 2 new file mode 100644 | |
| 3 index 0000000..78a4727 | |
| 4 --- /dev/null | |
| 5 +++ b/third_party/libevent/event-config.h | |
| 6 @@ -0,0 +1,14 @@ | |
| 7 +// 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 | |
| 9 +// found in the LICENSE file. | |
| 10 + | |
| 11 +// This file is Chromium-specific, and brings in the appropriate | |
| 12 +// event-config.h depending on your platform. | |
| 13 + | |
| 14 +#if defined(__APPLE__) | |
| 15 +#include "mac/event-config.h" | |
| 16 +#elif defined(__linux__) | |
| 17 +#include "linux/event-config.h" | |
| 18 +#else | |
| 19 +#error FIXME | |
|
Mark Mentovai
2009/11/20 16:31:33
Could be a tiny bit more descriptive. Same in the
| |
| 20 +#endif | |
| 21 diff --git a/third_party/libevent/event.h b/third_party/libevent/event.h | |
| 22 index cfa0fc3..72e9b8b 100644 | |
| 23 --- a/third_party/libevent/event.h | |
| 24 +++ b/third_party/libevent/event.h | |
| 25 @@ -159,7 +159,7 @@ | |
| 26 extern "C" { | |
| 27 #endif | |
| 28 | |
| 29 -#include <event-config.h> | |
| 30 +#include "event-config.h" | |
| 31 #ifdef _EVENT_HAVE_SYS_TYPES_H | |
| 32 #include <sys/types.h> | |
| 33 #endif | |
| 34 @@ -172,7 +172,7 @@ extern "C" { | |
| 35 #include <stdarg.h> | |
| 36 | |
| 37 /* For int types. */ | |
| 38 -#include <evutil.h> | |
| 39 +#include "evutil.h" | |
| 40 | |
| 41 #ifdef WIN32 | |
| 42 #define WIN32_LEAN_AND_MEAN | |
| 43 diff --git a/third_party/libevent/evutil.h b/third_party/libevent/evutil.h | |
| 44 index dcb0013..8b664b9 100644 | |
| 45 --- a/third_party/libevent/evutil.h | |
| 46 +++ b/third_party/libevent/evutil.h | |
| 47 @@ -38,7 +38,7 @@ | |
| 48 extern "C" { | |
| 49 #endif | |
| 50 | |
| 51 -#include <event-config.h> | |
| 52 +#include "event-config.h" | |
| 53 #ifdef _EVENT_HAVE_SYS_TIME_H | |
| 54 #include <sys/time.h> | |
| 55 #endif | |
| OLD | NEW |
