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

Side by Side Diff: Source/wtf/ByteOrder.h

Issue 23003024: Revert r156542 "Do not include "wtf/Platform.h" directly. " (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 months 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 | Annotate | Revision Log
« no previous file with comments | « Source/wtf/Atomics.h ('k') | Source/wtf/DataLog.h » ('j') | 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 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef WTF_ByteOrder_h 31 #ifndef WTF_ByteOrder_h
32 #define WTF_ByteOrder_h 32 #define WTF_ByteOrder_h
33 33
34 #include "wtf/CPU.h" 34 #include "wtf/CPU.h"
35 #include "wtf/Platform.h"
35 36
36 #if OS(UNIX) 37 #if OS(UNIX)
37 #include <arpa/inet.h> 38 #include <arpa/inet.h>
38 #endif 39 #endif
39 40
40 #if OS(WINDOWS) 41 #if OS(WINDOWS)
41 42
42 namespace WTF { 43 namespace WTF {
43 inline uint32_t wswap32(uint32_t x) { return ((x & 0xffff0000) >> 16) | ((x & 0x 0000ffff) << 16); } 44 inline uint32_t wswap32(uint32_t x) { return ((x & 0xffff0000) >> 16) | ((x & 0x 0000ffff) << 16); }
44 inline uint32_t bswap32(uint32_t x) { return ((x & 0xff000000) >> 24) | ((x & 0x 00ff0000) >> 8) | ((x & 0x0000ff00) << 8) | ((x & 0x000000ff) << 24); } 45 inline uint32_t bswap32(uint32_t x) { return ((x & 0xff000000) >> 24) | ((x & 0x 00ff0000) >> 8) | ((x & 0x0000ff00) << 8) | ((x & 0x000000ff) << 24); }
(...skipping 13 matching lines...) Expand all
58 #else 59 #else
59 inline uint16_t ntohs(uint16_t x) { return WTF::bswap16(x); } 60 inline uint16_t ntohs(uint16_t x) { return WTF::bswap16(x); }
60 inline uint16_t htons(uint16_t x) { return WTF::bswap16(x); } 61 inline uint16_t htons(uint16_t x) { return WTF::bswap16(x); }
61 inline uint32_t ntohl(uint32_t x) { return WTF::bswap32(x); } 62 inline uint32_t ntohl(uint32_t x) { return WTF::bswap32(x); }
62 inline uint32_t htonl(uint32_t x) { return WTF::bswap32(x); } 63 inline uint32_t htonl(uint32_t x) { return WTF::bswap32(x); }
63 #endif 64 #endif
64 65
65 #endif // OS(WINDOWS) 66 #endif // OS(WINDOWS)
66 67
67 #endif // WTF_ByteOrder_h 68 #endif // WTF_ByteOrder_h
OLDNEW
« no previous file with comments | « Source/wtf/Atomics.h ('k') | Source/wtf/DataLog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698