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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_utility.cc

Issue 1407053008: Fix win32 header include order in rtp_utility.h. (Closed) 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" 11 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
12 12
13 #include <assert.h> 13 #include <assert.h>
14 #include <math.h> // ceil 14 #include <math.h> // ceil
15 #include <string.h> // memcpy 15 #include <string.h> // memcpy
16 16
17 #if defined(_WIN32) 17 #if defined(_WIN32)
18 // Order for these headers are important 18 // Order for these headers are important
19 #include <Windows.h> // FILETIME 19 #include <winsock2.h> // timeval
20 20 #include <windows.h> // FILETIME
21 #include <WinSock.h> // timeval
22
23 #include <MMSystem.h> // timeGetTime 21 #include <MMSystem.h> // timeGetTime
24 #elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) 22 #elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC))
25 #include <sys/time.h> // gettimeofday 23 #include <sys/time.h> // gettimeofday
26 #include <time.h> 24 #include <time.h>
27 #endif 25 #endif
28 #if (defined(_DEBUG) && defined(_WIN32) && (_MSC_VER >= 1400)) 26 #if (defined(_DEBUG) && defined(_WIN32) && (_MSC_VER >= 1400))
29 #include <stdio.h> 27 #include <stdio.h>
30 #endif 28 #endif
31 29
32 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" 30 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 return num_zero_bytes; 497 return num_zero_bytes;
500 } 498 }
501 ptr++; 499 ptr++;
502 num_zero_bytes++; 500 num_zero_bytes++;
503 } 501 }
504 return num_zero_bytes; 502 return num_zero_bytes;
505 } 503 }
506 } // namespace RtpUtility 504 } // namespace RtpUtility
507 505
508 } // namespace webrtc 506 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698