| Index: third_party/WebKit/Source/wtf/ByteOrder.h
|
| diff --git a/third_party/WebKit/Source/wtf/ByteOrder.h b/third_party/WebKit/Source/wtf/ByteOrder.h
|
| index 4ba9cd8fb2b0e33991fdd2539abe5620154af1e9..35456a828cf5aa7892b33ece7961f03c239be286 100644
|
| --- a/third_party/WebKit/Source/wtf/ByteOrder.h
|
| +++ b/third_party/WebKit/Source/wtf/ByteOrder.h
|
| @@ -1,9 +1,86 @@
|
| -// Copyright 2017 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| +/*
|
| +* Copyright (C) 2012 Google Inc. All rights reserved.
|
| +*
|
| +* Redistribution and use in source and binary forms, with or without
|
| +* modification, are permitted provided that the following conditions are
|
| +* met:
|
| +*
|
| +* * Redistributions of source code must retain the above copyright
|
| +* notice, this list of conditions and the following disclaimer.
|
| +* * Redistributions in binary form must reproduce the above
|
| +* copyright notice, this list of conditions and the following disclaimer
|
| +* in the documentation and/or other materials provided with the
|
| +* distribution.
|
| +* * Neither the name of Google Inc. nor the names of its
|
| +* contributors may be used to endorse or promote products derived from
|
| +* this software without specific prior written permission.
|
| +*
|
| +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
| +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
| +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
| +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
| +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| +* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| +*/
|
|
|
| -#include "platform/wtf/ByteOrder.h"
|
| +#ifndef WTF_ByteOrder_h
|
| +#define WTF_ByteOrder_h
|
|
|
| -// The contents of this header was moved to platform/wtf as part of
|
| -// WTF migration project. See the following post for details:
|
| -// https://groups.google.com/a/chromium.org/d/msg/blink-dev/tLdAZCTlcAA/bYXVT8gYCAAJ
|
| +#if OS(POSIX)
|
| +#include <arpa/inet.h>
|
| +#endif
|
| +
|
| +#if OS(WIN)
|
| +
|
| +#include "wtf/ByteSwap.h"
|
| +#include "wtf/CPU.h"
|
| +
|
| +#if CPU(BIG_ENDIAN)
|
| +inline uint16_t ntohs(uint16_t x) {
|
| + return x;
|
| +}
|
| +inline uint16_t htons(uint16_t x) {
|
| + return x;
|
| +}
|
| +inline uint32_t ntohl(uint32_t x) {
|
| + return x;
|
| +}
|
| +inline uint32_t htonl(uint32_t x) {
|
| + return x;
|
| +}
|
| +#elif CPU(MIDDLE_ENDIAN)
|
| +inline uint16_t ntohs(uint16_t x) {
|
| + return x;
|
| +}
|
| +inline uint16_t htons(uint16_t x) {
|
| + return x;
|
| +}
|
| +inline uint32_t ntohl(uint32_t x) {
|
| + return WTF::wswap32(x);
|
| +}
|
| +inline uint32_t htonl(uint32_t x) {
|
| + return WTF::wswap32(x);
|
| +}
|
| +#else
|
| +inline uint16_t ntohs(uint16_t x) {
|
| + return WTF::bswap16(x);
|
| +}
|
| +inline uint16_t htons(uint16_t x) {
|
| + return WTF::bswap16(x);
|
| +}
|
| +inline uint32_t ntohl(uint32_t x) {
|
| + return WTF::bswap32(x);
|
| +}
|
| +inline uint32_t htonl(uint32_t x) {
|
| + return WTF::bswap32(x);
|
| +}
|
| +#endif
|
| +
|
| +#endif // OS(WIN)
|
| +
|
| +#endif // WTF_ByteOrder_h
|
|
|