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

Side by Side Diff: webrtc/base/logging.cc

Issue 1412363004: Revert of With these changes, WebRtc x86 will build Visual Studio 2015. Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #if defined(WEBRTC_WIN) 11 #if defined(WEBRTC_WIN)
12 #if !defined(WIN32_LEAN_AND_MEAN) 12 #if !defined(WIN32_LEAN_AND_MEAN)
13 #define WIN32_LEAN_AND_MEAN 13 #define WIN32_LEAN_AND_MEAN
14 #endif 14 #endif
15 #include <windows.h> 15 #include <windows.h>
16 #if _MSC_VER < 1900
17 #define snprintf _snprintf 16 #define snprintf _snprintf
18 #endif
19 #undef ERROR // wingdi.h 17 #undef ERROR // wingdi.h
20 #endif 18 #endif
21 19
22 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) 20 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
23 #include <CoreServices/CoreServices.h> 21 #include <CoreServices/CoreServices.h>
24 #elif defined(WEBRTC_ANDROID) 22 #elif defined(WEBRTC_ANDROID)
25 #include <android/log.h> 23 #include <android/log.h>
26 // Android has a 1024 limit on log inputs. We use 60 chars as an 24 // Android has a 1024 limit on log inputs. We use 60 chars as an
27 // approx for the header/tag portion. 25 // approx for the header/tag portion.
28 // See android/system/core/liblog/logd_write.c 26 // See android/system/core/liblog/logd_write.c
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 } 547 }
550 548
551 if (state) { 549 if (state) {
552 state->unprintable_count_[input] = consecutive_unprintable; 550 state->unprintable_count_[input] = consecutive_unprintable;
553 } 551 }
554 } 552 }
555 553
556 ////////////////////////////////////////////////////////////////////// 554 //////////////////////////////////////////////////////////////////////
557 555
558 } // namespace rtc 556 } // namespace rtc
OLDNEW
« no previous file with comments | « AUTHORS ('k') | webrtc/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698