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

Side by Side Diff: media/cdm/ppapi/cdm_logging.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years 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 // 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 // Only compile this file in debug build. This gives us one more level of 5 // Only compile this file in debug build. This gives us one more level of
6 // protection that if the linker tries to link in strings/symbols appended to 6 // protection that if the linker tries to link in strings/symbols appended to
7 // "DLOG() <<" in release build (which it shouldn't), we'll get "undefined 7 // "DLOG() <<" in release build (which it shouldn't), we'll get "undefined
8 // reference" errors. 8 // reference" errors.
9 9
10 #include "media/cdm/ppapi/cdm_logging.h" 10 #include "media/cdm/ppapi/cdm_logging.h"
11 11
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 13
14 #if defined(OS_WIN) 14 #if defined(OS_WIN)
15 #include <io.h> 15 #include <io.h>
16 #include <windows.h> 16 #include <windows.h>
17 #elif defined(OS_MACOSX) 17 #elif defined(OS_MACOSX)
18 #include <mach/mach.h> 18 #include <mach/mach.h>
19 #include <mach/mach_time.h> 19 #include <mach/mach_time.h>
20 #include <mach-o/dyld.h> 20 #include <mach-o/dyld.h>
21 #elif defined(OS_POSIX) 21 #elif defined(OS_POSIX)
22 #include <sys/syscall.h> 22 #include <sys/syscall.h>
23 #include <time.h> 23 #include <time.h>
24 #endif 24 #endif
25 25
26 #if defined(OS_POSIX) 26 #if defined(OS_POSIX)
27 #include <errno.h> 27 #include <errno.h>
28 #include <pthread.h> 28 #include <pthread.h>
29 #include <stdio.h>
29 #include <stdlib.h> 30 #include <stdlib.h>
30 #include <stdio.h>
31 #include <string.h> 31 #include <string.h>
32 #include <unistd.h> 32 #include <unistd.h>
33 #endif 33 #endif
34 34
35 #include <stddef.h>
35 #include <stdint.h> 36 #include <stdint.h>
36 37
37 #include <iomanip> 38 #include <iomanip>
38 #include <iostream> 39 #include <iostream>
39 40
40 namespace media { 41 namespace media {
41 42
42 #if !defined(NDEBUG) 43 #if !defined(NDEBUG)
43 44
44 namespace { 45 namespace {
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 std::cout << std::endl; 135 std::cout << std::endl;
135 } 136 }
136 137
137 #endif // !defined(NDEBUG) 138 #endif // !defined(NDEBUG)
138 139
139 std::ostream& CdmLogStream::stream() { 140 std::ostream& CdmLogStream::stream() {
140 return std::cout; 141 return std::cout;
141 } 142 }
142 143
143 } // namespace media 144 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/ppapi/cdm_file_io_test.cc ('k') | media/cdm/ppapi/external_clear_key/cdm_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698