| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) | 5 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) |
| 6 #include <math.h> // needed for _set_FMA3_enable | 6 #include <math.h> // needed for _set_FMA3_enable |
| 7 #endif // WIN && ARCH_CPU_X86_64 | 7 #endif // WIN && ARCH_CPU_X86_64 |
| 8 | 8 |
| 9 #include "allocator_shim/allocator_stub.h" | |
| 10 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 11 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| 12 #include "base/logging.h" | 11 #include "base/logging.h" |
| 13 #include "init_webrtc.h" | 12 #include "third_party/libjingle/source/talk/media/webrtc/webrtcmediaengine.h" |
| 14 #include "talk/media/webrtc/webrtcmediaengine.h" | 13 #include "third_party/libjingle/allocator_shim/allocator_stub.h" |
| 15 #include "webrtc/base/basictypes.h" | 14 #include "third_party/libjingle/overrides/init_webrtc.h" |
| 16 #include "webrtc/base/logging.h" | 15 #include "third_party/webrtc/base/basictypes.h" |
| 16 #include "third_party/webrtc/base/logging.h" |
| 17 | 17 |
| 18 #if !defined(LIBPEERCONNECTION_IMPLEMENTATION) || defined(LIBPEERCONNECTION_LIB) | 18 #if !defined(LIBPEERCONNECTION_IMPLEMENTATION) || defined(LIBPEERCONNECTION_LIB) |
| 19 #error "Only compile the allocator proxy with the shared_library implementation" | 19 #error "Only compile the allocator proxy with the shared_library implementation" |
| 20 #endif | 20 #endif |
| 21 | 21 |
| 22 #if defined(OS_WIN) | 22 #if defined(OS_WIN) |
| 23 #define ALLOC_EXPORT __declspec(dllexport) | 23 #define ALLOC_EXPORT __declspec(dllexport) |
| 24 #else | 24 #else |
| 25 #define ALLOC_EXPORT __attribute__((visibility("default"))) | 25 #define ALLOC_EXPORT __attribute__((visibility("default"))) |
| 26 #endif | 26 #endif |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 | 138 |
| 139 // Override the log message handler to forward logs to chrome's handler. | 139 // Override the log message handler to forward logs to chrome's handler. |
| 140 logging::SetLogMessageHandler(log_handler); | 140 logging::SetLogMessageHandler(log_handler); |
| 141 webrtc::SetupEventTracer(trace_get_category_enabled, | 141 webrtc::SetupEventTracer(trace_get_category_enabled, |
| 142 trace_add_trace_event); | 142 trace_add_trace_event); |
| 143 } | 143 } |
| 144 | 144 |
| 145 return true; | 145 return true; |
| 146 } | 146 } |
| 147 } // extern "C" | 147 } // extern "C" |
| OLD | NEW |