diff --git a/thirdparty/cvtt/ConvectionKernels.h b/thirdparty/cvtt/ConvectionKernels.h index fb5ca130f..d2d86d38b 100644 --- a/thirdparty/cvtt/ConvectionKernels.h +++ b/thirdparty/cvtt/ConvectionKernels.h @@ -1,3 +1,5 @@ +#ifndef __CVTT_CONVECTION_KERNELS__ +#define __CVTT_CONVECTION_KERNELS__ /* Convection Texture Tools Copyright (c) 2018 Eric Lasota @@ -22,8 +24,8 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #pragma once -#ifndef __CVTT_CONVECTION_KERNELS__ -#define __CVTT_CONVECTION_KERNELS__ + + #include diff --git a/thirdparty/enet/enet/callbacks.h b/thirdparty/enet/enet/callbacks.h index 340a4a989..4e5505fe5 100644 --- a/thirdparty/enet/enet/callbacks.h +++ b/thirdparty/enet/enet/callbacks.h @@ -1,9 +1,11 @@ +#ifndef __ENET_CALLBACKS_H__ +#define __ENET_CALLBACKS_H__ /** @file callbacks.h @brief ENet callbacks */ -#ifndef __ENET_CALLBACKS_H__ -#define __ENET_CALLBACKS_H__ + + #include diff --git a/thirdparty/enet/enet/enet.h b/thirdparty/enet/enet/enet.h index 77f8004b8..2c1a38e4d 100644 --- a/thirdparty/enet/enet/enet.h +++ b/thirdparty/enet/enet/enet.h @@ -1,9 +1,11 @@ +#ifndef __ENET_ENET_H__ +#define __ENET_ENET_H__ /** @file enet.h @brief ENet public header file */ -#ifndef __ENET_ENET_H__ -#define __ENET_ENET_H__ + + #ifdef __cplusplus extern "C" diff --git a/thirdparty/enet/enet/godot.h b/thirdparty/enet/enet/godot.h index faca1f21a..a90b68fab 100644 --- a/thirdparty/enet/enet/godot.h +++ b/thirdparty/enet/enet/godot.h @@ -1,3 +1,5 @@ +#ifndef __ENET_GODOT_H__ +#define __ENET_GODOT_H__ /*************************************************************************/ /* godot.h */ /*************************************************************************/ @@ -32,8 +34,8 @@ @brief ENet Godot header */ -#ifndef __ENET_GODOT_H__ -#define __ENET_GODOT_H__ + + #ifdef WINDOWS_ENABLED #include diff --git a/thirdparty/enet/enet/list.h b/thirdparty/enet/enet/list.h index d7b260084..8f1ee83aa 100644 --- a/thirdparty/enet/enet/list.h +++ b/thirdparty/enet/enet/list.h @@ -1,9 +1,11 @@ +#ifndef __ENET_LIST_H__ +#define __ENET_LIST_H__ /** @file list.h @brief ENet list management */ -#ifndef __ENET_LIST_H__ -#define __ENET_LIST_H__ + + #include diff --git a/thirdparty/enet/enet/protocol.h b/thirdparty/enet/enet/protocol.h index f8c73d8a6..6499a4a5b 100644 --- a/thirdparty/enet/enet/protocol.h +++ b/thirdparty/enet/enet/protocol.h @@ -1,9 +1,11 @@ +#ifndef __ENET_PROTOCOL_H__ +#define __ENET_PROTOCOL_H__ /** @file protocol.h @brief ENet protocol */ -#ifndef __ENET_PROTOCOL_H__ -#define __ENET_PROTOCOL_H__ + + #include "enet/types.h" diff --git a/thirdparty/enet/enet/time.h b/thirdparty/enet/enet/time.h index c82a54603..e6b699877 100644 --- a/thirdparty/enet/enet/time.h +++ b/thirdparty/enet/enet/time.h @@ -1,9 +1,11 @@ +#ifndef __ENET_TIME_H__ +#define __ENET_TIME_H__ /** @file time.h @brief ENet time constants and macros */ -#ifndef __ENET_TIME_H__ -#define __ENET_TIME_H__ + + #define ENET_TIME_OVERFLOW 86400000 diff --git a/thirdparty/enet/enet/types.h b/thirdparty/enet/enet/types.h index ab010a4b1..45d83d404 100644 --- a/thirdparty/enet/enet/types.h +++ b/thirdparty/enet/enet/types.h @@ -1,9 +1,11 @@ +#ifndef __ENET_TYPES_H__ +#define __ENET_TYPES_H__ /** @file types.h @brief type definitions for ENet */ -#ifndef __ENET_TYPES_H__ -#define __ENET_TYPES_H__ + + typedef unsigned char enet_uint8; /**< unsigned 8-bit type */ typedef unsigned short enet_uint16; /**< unsigned 16-bit type */ diff --git a/thirdparty/enet/enet/utility.h b/thirdparty/enet/enet/utility.h index b04bb7a5b..55fc3055e 100644 --- a/thirdparty/enet/enet/utility.h +++ b/thirdparty/enet/enet/utility.h @@ -1,9 +1,11 @@ +#ifndef __ENET_UTILITY_H__ +#define __ENET_UTILITY_H__ /** @file utility.h @brief ENet utility header */ -#ifndef __ENET_UTILITY_H__ -#define __ENET_UTILITY_H__ + + #define ENET_MAX(x, y) ((x) > (y) ? (x) : (y)) #define ENET_MIN(x, y) ((x) < (y) ? (x) : (y)) diff --git a/thirdparty/glad/glad/glad.h b/thirdparty/glad/glad/glad.h index b328522e1..abdb7ff79 100644 --- a/thirdparty/glad/glad/glad.h +++ b/thirdparty/glad/glad/glad.h @@ -1,3 +1,5 @@ +#ifndef __glad_h_ +#define __glad_h_ /* OpenGL loader generated by glad 0.1.34 on Fri Feb 19 21:01:51 2021. @@ -27,8 +29,8 @@ */ -#ifndef __glad_h_ -#define __glad_h_ + + #ifdef __gl_h_ #error OpenGL header already included, remove this include, glad already provides it diff --git a/thirdparty/jpeg-compressor/jpgd.h b/thirdparty/jpeg-compressor/jpgd.h index 39136696b..61a31d03b 100644 --- a/thirdparty/jpeg-compressor/jpgd.h +++ b/thirdparty/jpeg-compressor/jpgd.h @@ -1,8 +1,10 @@ +#ifndef JPEG_DECODER_H +#define JPEG_DECODER_H // jpgd.h - C++ class for JPEG decompression. // Richard Geldreich // See jpgd.cpp for license (Public Domain or Apache 2.0). -#ifndef JPEG_DECODER_H -#define JPEG_DECODER_H + + #include #include diff --git a/thirdparty/libogg/ogg/ogg.h b/thirdparty/libogg/ogg/ogg.h index c4325aa76..7eca15e1c 100644 --- a/thirdparty/libogg/ogg/ogg.h +++ b/thirdparty/libogg/ogg/ogg.h @@ -1,3 +1,5 @@ +#ifndef _OGG_H +#define _OGG_H /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -13,8 +15,8 @@ function: toplevel libogg include ********************************************************************/ -#ifndef _OGG_H -#define _OGG_H + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libogg/ogg/os_types.h b/thirdparty/libogg/ogg/os_types.h index e655a1d62..75e3c7993 100644 --- a/thirdparty/libogg/ogg/os_types.h +++ b/thirdparty/libogg/ogg/os_types.h @@ -1,3 +1,5 @@ +#ifndef _OS_TYPES_H +#define _OS_TYPES_H /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -13,8 +15,8 @@ function: Define a consistent set of types on each platform. ********************************************************************/ -#ifndef _OS_TYPES_H -#define _OS_TYPES_H + + /* make it easy on the folks that want to compile the libs with a different malloc than stdlib */ diff --git a/thirdparty/libpng/png.h b/thirdparty/libpng/png.h index b12174ba3..e0c411455 100644 --- a/thirdparty/libpng/png.h +++ b/thirdparty/libpng/png.h @@ -1,3 +1,5 @@ +#ifndef PNG_H +#define PNG_H /* png.h - header file for PNG reference library * @@ -263,8 +265,8 @@ * */ -#ifndef PNG_H -#define PNG_H + + /* This is not the place to learn how to use libpng. The file libpng-manual.txt * describes how to use libpng, and the file example.c summarizes it diff --git a/thirdparty/libpng/pngconf.h b/thirdparty/libpng/pngconf.h index 927a769db..daf1d18cb 100644 --- a/thirdparty/libpng/pngconf.h +++ b/thirdparty/libpng/pngconf.h @@ -1,3 +1,5 @@ +#ifndef PNGCONF_H +#define PNGCONF_H /* pngconf.h - machine-configurable file for libpng * @@ -18,8 +20,8 @@ * and png_info. */ -#ifndef PNGCONF_H -#define PNGCONF_H + + #ifndef PNG_BUILDING_SYMBOL_TABLE /* else includes may cause problems */ diff --git a/thirdparty/libpng/pngdebug.h b/thirdparty/libpng/pngdebug.h index 00d5a4569..8dfe09e10 100644 --- a/thirdparty/libpng/pngdebug.h +++ b/thirdparty/libpng/pngdebug.h @@ -1,3 +1,5 @@ +#ifndef PNGDEBUG_H +#define PNGDEBUG_H /* pngdebug.h - Debugging macros for libpng, also used in pngtest.c * @@ -31,8 +33,8 @@ * to the message. * arg: 0 to 2 arguments for printf(3) style substitution in message. */ -#ifndef PNGDEBUG_H -#define PNGDEBUG_H + + /* These settings control the formatting of messages in png.c and pngerror.c */ /* Moved to pngdebug.h at 1.5.0 */ # ifndef PNG_LITERAL_SHARP diff --git a/thirdparty/libpng/pnginfo.h b/thirdparty/libpng/pnginfo.h index ac7b26913..4af65ce59 100644 --- a/thirdparty/libpng/pnginfo.h +++ b/thirdparty/libpng/pnginfo.h @@ -1,3 +1,5 @@ +#ifndef PNGINFO_H +#define PNGINFO_H /* pnginfo.h - header file for PNG reference library * @@ -49,8 +51,8 @@ * itxt_ptr structure argument, and the png_set_rows and png_set_unknowns * functions do not make their own copies. */ -#ifndef PNGINFO_H -#define PNGINFO_H + + struct png_info_def { diff --git a/thirdparty/libpng/pnglibconf.h b/thirdparty/libpng/pnglibconf.h index e1e27e957..f7cf008a0 100644 --- a/thirdparty/libpng/pnglibconf.h +++ b/thirdparty/libpng/pnglibconf.h @@ -1,3 +1,5 @@ +#ifndef PNGLCONF_H +#define PNGLCONF_H /* pnglibconf.h - library build configuration */ /* libpng version 1.6.37 */ @@ -12,8 +14,8 @@ /* pnglibconf.h */ /* Machine generated file: DO NOT EDIT */ /* Derived from: scripts/pnglibconf.dfa */ -#ifndef PNGLCONF_H -#define PNGLCONF_H + + /* options */ #define PNG_16BIT_SUPPORTED #define PNG_ALIGNED_MEMORY_SUPPORTED diff --git a/thirdparty/libpng/pngpriv.h b/thirdparty/libpng/pngpriv.h index 57e1bf989..eb4feee66 100644 --- a/thirdparty/libpng/pngpriv.h +++ b/thirdparty/libpng/pngpriv.h @@ -1,3 +1,5 @@ +#ifndef PNGPRIV_H +#define PNGPRIV_H /* pngpriv.h - private declarations for use inside libpng * @@ -20,8 +22,8 @@ * they should be well aware of the issues that may arise from doing so. */ -#ifndef PNGPRIV_H -#define PNGPRIV_H + + /* Feature Test Macros. The following are defined here to ensure that correctly * implemented libraries reveal the APIs libpng needs to build and hide those diff --git a/thirdparty/libpng/pngstruct.h b/thirdparty/libpng/pngstruct.h index 2a2236f92..f72f25098 100644 --- a/thirdparty/libpng/pngstruct.h +++ b/thirdparty/libpng/pngstruct.h @@ -1,3 +1,5 @@ +#ifndef PNGSTRUCT_H +#define PNGSTRUCT_H /* pngstruct.h - header file for PNG reference library * @@ -17,8 +19,8 @@ * It should NOT be accessed directly by an application. */ -#ifndef PNGSTRUCT_H -#define PNGSTRUCT_H + + /* zlib.h defines the structure z_stream, an instance of which is included * in this structure and is required for decompressing the LZ compressed * data in PNG files. diff --git a/thirdparty/libsimplewebm/libwebm/common/webmids.h b/thirdparty/libsimplewebm/libwebm/common/webmids.h index 89d722a71..44b4d7fdf 100644 --- a/thirdparty/libsimplewebm/libwebm/common/webmids.h +++ b/thirdparty/libsimplewebm/libwebm/common/webmids.h @@ -1,3 +1,5 @@ +#ifndef COMMON_WEBMIDS_H_ +#define COMMON_WEBMIDS_H_ // Copyright (c) 2012 The WebM project authors. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -6,8 +8,8 @@ // in the file PATENTS. All contributing project authors may // be found in the AUTHORS file in the root of the source tree. -#ifndef COMMON_WEBMIDS_H_ -#define COMMON_WEBMIDS_H_ + + namespace libwebm { diff --git a/thirdparty/libsimplewebm/libwebm/mkvmuxer/mkvmuxertypes.h b/thirdparty/libsimplewebm/libwebm/mkvmuxer/mkvmuxertypes.h index e5db12160..360cfb132 100644 --- a/thirdparty/libsimplewebm/libwebm/mkvmuxer/mkvmuxertypes.h +++ b/thirdparty/libsimplewebm/libwebm/mkvmuxer/mkvmuxertypes.h @@ -1,3 +1,5 @@ +#ifndef MKVMUXER_MKVMUXERTYPES_H_ +#define MKVMUXER_MKVMUXERTYPES_H_ // Copyright (c) 2012 The WebM project authors. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -6,8 +8,8 @@ // in the file PATENTS. All contributing project authors may // be found in the AUTHORS file in the root of the source tree. -#ifndef MKVMUXER_MKVMUXERTYPES_H_ -#define MKVMUXER_MKVMUXERTYPES_H_ + + namespace mkvmuxer { typedef unsigned char uint8; diff --git a/thirdparty/libsimplewebm/libwebm/mkvparser/mkvparser.h b/thirdparty/libsimplewebm/libwebm/mkvparser/mkvparser.h index 6dce7e50b..ec9eb5abc 100644 --- a/thirdparty/libsimplewebm/libwebm/mkvparser/mkvparser.h +++ b/thirdparty/libsimplewebm/libwebm/mkvparser/mkvparser.h @@ -1,3 +1,5 @@ +#ifndef MKVPARSER_MKVPARSER_H_ +#define MKVPARSER_MKVPARSER_H_ // Copyright (c) 2012 The WebM project authors. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -5,8 +7,8 @@ // tree. An additional intellectual property rights grant can be found // in the file PATENTS. All contributing project authors may // be found in the AUTHORS file in the root of the source tree. -#ifndef MKVPARSER_MKVPARSER_H_ -#define MKVPARSER_MKVPARSER_H_ + + #include diff --git a/thirdparty/libtheora/theora/theora.h b/thirdparty/libtheora/theora/theora.h index af6eb6f38..e68f504a9 100644 --- a/thirdparty/libtheora/theora/theora.h +++ b/thirdparty/libtheora/theora/theora.h @@ -1,3 +1,5 @@ +#ifndef _O_THEORA_H_ +#define _O_THEORA_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggTheora SOFTWARE CODEC SOURCE CODE. * @@ -15,8 +17,8 @@ ********************************************************************/ -#ifndef _O_THEORA_H_ -#define _O_THEORA_H_ + + #ifdef __cplusplus extern "C" diff --git a/thirdparty/libvorbis/backends.h b/thirdparty/libvorbis/backends.h index 670b0b902..575e9889f 100644 --- a/thirdparty/libvorbis/backends.h +++ b/thirdparty/libvorbis/backends.h @@ -1,3 +1,5 @@ +#ifndef _vorbis_backend_h_ +#define _vorbis_backend_h_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -19,8 +21,8 @@ Lookups for each backend aren't exposed because there's no reason to do so */ -#ifndef _vorbis_backend_h_ -#define _vorbis_backend_h_ + + #include "codec_internal.h" diff --git a/thirdparty/libvorbis/bitrate.h b/thirdparty/libvorbis/bitrate.h index 48fa15059..d351349b8 100644 --- a/thirdparty/libvorbis/bitrate.h +++ b/thirdparty/libvorbis/bitrate.h @@ -1,3 +1,5 @@ +#ifndef _V_BITRATE_H_ +#define _V_BITRATE_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _V_BITRATE_H_ -#define _V_BITRATE_H_ + + #include "vorbis/codec.h" #include "codec_internal.h" diff --git a/thirdparty/libvorbis/codebook.h b/thirdparty/libvorbis/codebook.h index 7d4e2aae4..f749b7e98 100644 --- a/thirdparty/libvorbis/codebook.h +++ b/thirdparty/libvorbis/codebook.h @@ -1,3 +1,5 @@ +#ifndef _V_CODEBOOK_H_ +#define _V_CODEBOOK_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _V_CODEBOOK_H_ -#define _V_CODEBOOK_H_ + + #include diff --git a/thirdparty/libvorbis/codec_internal.h b/thirdparty/libvorbis/codec_internal.h index 2ecf5e5c7..112804016 100644 --- a/thirdparty/libvorbis/codec_internal.h +++ b/thirdparty/libvorbis/codec_internal.h @@ -1,3 +1,5 @@ +#ifndef _V_CODECI_H_ +#define _V_CODECI_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _V_CODECI_H_ -#define _V_CODECI_H_ + + #include "envelope.h" #include "codebook.h" diff --git a/thirdparty/libvorbis/envelope.h b/thirdparty/libvorbis/envelope.h index 2ef60a82c..3aec0df0a 100644 --- a/thirdparty/libvorbis/envelope.h +++ b/thirdparty/libvorbis/envelope.h @@ -1,3 +1,5 @@ +#ifndef _V_ENVELOPE_ +#define _V_ENVELOPE_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _V_ENVELOPE_ -#define _V_ENVELOPE_ + + #include "mdct.h" diff --git a/thirdparty/libvorbis/lookup_data.h b/thirdparty/libvorbis/lookup_data.h index 7935715a7..a6c12b30c 100644 --- a/thirdparty/libvorbis/lookup_data.h +++ b/thirdparty/libvorbis/lookup_data.h @@ -1,3 +1,5 @@ +#ifndef _V_LOOKUP_DATA_H_ +#define COS_LOOKUP_SZ 128 /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,10 +16,10 @@ ********************************************************************/ -#ifndef _V_LOOKUP_DATA_H_ + #ifdef FLOAT_LOOKUP -#define COS_LOOKUP_SZ 128 + static const float COS_LOOKUP[COS_LOOKUP_SZ+1]={ +1.0000000000000f,+0.9996988186962f,+0.9987954562052f,+0.9972904566787f, +0.9951847266722f,+0.9924795345987f,+0.9891765099648f,+0.9852776423889f, diff --git a/thirdparty/libvorbis/lpc.h b/thirdparty/libvorbis/lpc.h index 4f59e6d32..bed479565 100644 --- a/thirdparty/libvorbis/lpc.h +++ b/thirdparty/libvorbis/lpc.h @@ -1,3 +1,5 @@ +#ifndef _V_LPC_H_ +#define _V_LPC_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _V_LPC_H_ -#define _V_LPC_H_ + + #include "vorbis/codec.h" diff --git a/thirdparty/libvorbis/lsp.h b/thirdparty/libvorbis/lsp.h index 68b38daf1..a61c78326 100644 --- a/thirdparty/libvorbis/lsp.h +++ b/thirdparty/libvorbis/lsp.h @@ -1,3 +1,5 @@ +#ifndef _V_LSP_H_ +#define _V_LSP_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -15,8 +17,8 @@ ********************************************************************/ -#ifndef _V_LSP_H_ -#define _V_LSP_H_ + + extern int vorbis_lpc_to_lsp(float *lpc,float *lsp,int m); diff --git a/thirdparty/libvorbis/masking.h b/thirdparty/libvorbis/masking.h index 7a196a37e..b0d1d0f30 100644 --- a/thirdparty/libvorbis/masking.h +++ b/thirdparty/libvorbis/masking.h @@ -1,3 +1,5 @@ +#ifndef _V_MASKING_H_ +#define _V_MASKING_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _V_MASKING_H_ -#define _V_MASKING_H_ + + /* more detailed ATH; the bass if flat to save stressing the floor overly for only a bin or two of savings. */ diff --git a/thirdparty/libvorbis/mdct.h b/thirdparty/libvorbis/mdct.h index ceaea617a..5929e0117 100644 --- a/thirdparty/libvorbis/mdct.h +++ b/thirdparty/libvorbis/mdct.h @@ -1,3 +1,5 @@ +#ifndef _OGG_mdct_H_ +#define _OGG_mdct_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _OGG_mdct_H_ -#define _OGG_mdct_H_ + + #include "vorbis/codec.h" diff --git a/thirdparty/libvorbis/misc.h b/thirdparty/libvorbis/misc.h index eac5160e8..aa68c302c 100644 --- a/thirdparty/libvorbis/misc.h +++ b/thirdparty/libvorbis/misc.h @@ -1,3 +1,5 @@ +#ifndef _V_RANDOM_H_ +#define _V_RANDOM_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _V_RANDOM_H_ -#define _V_RANDOM_H_ + + #include "vorbis/codec.h" extern void *_vorbis_block_alloc(vorbis_block *vb,long bytes); diff --git a/thirdparty/libvorbis/psy.h b/thirdparty/libvorbis/psy.h index d9a04e8b7..0059c5363 100644 --- a/thirdparty/libvorbis/psy.h +++ b/thirdparty/libvorbis/psy.h @@ -1,3 +1,5 @@ +#ifndef _V_PSY_H_ +#define _V_PSY_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _V_PSY_H_ -#define _V_PSY_H_ + + #include "smallft.h" #include "backends.h" diff --git a/thirdparty/libvorbis/registry.h b/thirdparty/libvorbis/registry.h index b823aa609..3520813d9 100644 --- a/thirdparty/libvorbis/registry.h +++ b/thirdparty/libvorbis/registry.h @@ -1,3 +1,5 @@ +#ifndef _V_REG_H_ +#define _V_REG_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _V_REG_H_ -#define _V_REG_H_ + + #define VI_TRANSFORMB 1 #define VI_WINDOWB 1 diff --git a/thirdparty/libvorbis/scales.h b/thirdparty/libvorbis/scales.h index 3c2ae48d9..560b4acb5 100644 --- a/thirdparty/libvorbis/scales.h +++ b/thirdparty/libvorbis/scales.h @@ -1,3 +1,5 @@ +#ifndef _V_SCALES_H_ +#define _V_SCALES_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _V_SCALES_H_ -#define _V_SCALES_H_ + + #include #include "os.h" diff --git a/thirdparty/libvorbis/smallft.h b/thirdparty/libvorbis/smallft.h index 02fe8f9cd..71d837daa 100644 --- a/thirdparty/libvorbis/smallft.h +++ b/thirdparty/libvorbis/smallft.h @@ -1,3 +1,5 @@ +#ifndef _V_SMFT_H_ +#define _V_SMFT_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _V_SMFT_H_ -#define _V_SMFT_H_ + + #include "vorbis/codec.h" diff --git a/thirdparty/libvorbis/vorbis/codec.h b/thirdparty/libvorbis/vorbis/codec.h index f8a912bc2..bafcd77fe 100644 --- a/thirdparty/libvorbis/vorbis/codec.h +++ b/thirdparty/libvorbis/vorbis/codec.h @@ -1,3 +1,5 @@ +#ifndef _vorbis_codec_h_ +#define _vorbis_codec_h_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _vorbis_codec_h_ -#define _vorbis_codec_h_ + + #ifdef __cplusplus extern "C" diff --git a/thirdparty/libvorbis/vorbis/vorbisenc.h b/thirdparty/libvorbis/vorbis/vorbisenc.h index 085b15e66..9d70c7ed0 100644 --- a/thirdparty/libvorbis/vorbis/vorbisenc.h +++ b/thirdparty/libvorbis/vorbis/vorbisenc.h @@ -1,3 +1,5 @@ +#ifndef _OV_ENC_H_ +#define _OV_ENC_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -20,8 +22,8 @@ * actions needed to set up the encoder properly. */ -#ifndef _OV_ENC_H_ -#define _OV_ENC_H_ + + #ifdef __cplusplus extern "C" diff --git a/thirdparty/libvorbis/vorbis/vorbisfile.h b/thirdparty/libvorbis/vorbis/vorbisfile.h index 3d65393f5..601b1e898 100644 --- a/thirdparty/libvorbis/vorbis/vorbisfile.h +++ b/thirdparty/libvorbis/vorbis/vorbisfile.h @@ -1,3 +1,5 @@ +#ifndef _OV_FILE_H_ +#define _OV_FILE_H_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _OV_FILE_H_ -#define _OV_FILE_H_ + + #ifdef __cplusplus extern "C" diff --git a/thirdparty/libvorbis/window.h b/thirdparty/libvorbis/window.h index 33d83f85f..d29e8ad85 100644 --- a/thirdparty/libvorbis/window.h +++ b/thirdparty/libvorbis/window.h @@ -1,3 +1,5 @@ +#ifndef _V_WINDOW_ +#define _V_WINDOW_ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * @@ -14,8 +16,8 @@ ********************************************************************/ -#ifndef _V_WINDOW_ -#define _V_WINDOW_ + + extern const float *_vorbis_window_get(int n); extern void _vorbis_apply_window(float *d,int *winno,long *blocksizes, diff --git a/thirdparty/libvpx/third_party/android/cpu-features.h b/thirdparty/libvpx/third_party/android/cpu-features.h index 1e9724197..6d336cd26 100644 --- a/thirdparty/libvpx/third_party/android/cpu-features.h +++ b/thirdparty/libvpx/third_party/android/cpu-features.h @@ -1,3 +1,5 @@ +#ifndef CPU_FEATURES_H +#define CPU_FEATURES_H /* * Copyright (C) 2010 The Android Open Source Project * All rights reserved. @@ -25,8 +27,8 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#ifndef CPU_FEATURES_H -#define CPU_FEATURES_H + + #include #include diff --git a/thirdparty/libvpx/vp8/common/alloccommon.h b/thirdparty/libvpx/vp8/common/alloccommon.h index 93e99d76b..96428dc30 100644 --- a/thirdparty/libvpx/vp8/common/alloccommon.h +++ b/thirdparty/libvpx/vp8/common/alloccommon.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_ALLOCCOMMON_H_ +#define VP8_COMMON_ALLOCCOMMON_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_ALLOCCOMMON_H_ -#define VP8_COMMON_ALLOCCOMMON_H_ + + #include "onyxc_int.h" diff --git a/thirdparty/libvpx/vp8/common/blockd.h b/thirdparty/libvpx/vp8/common/blockd.h index 192108a06..461a9e76c 100644 --- a/thirdparty/libvpx/vp8/common/blockd.h +++ b/thirdparty/libvpx/vp8/common/blockd.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_BLOCKD_H_ +#define VP8_COMMON_BLOCKD_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_BLOCKD_H_ -#define VP8_COMMON_BLOCKD_H_ + + void vpx_log(const char *format, ...); diff --git a/thirdparty/libvpx/vp8/common/coefupdateprobs.h b/thirdparty/libvpx/vp8/common/coefupdateprobs.h index d96a19e74..23df1ac5f 100644 --- a/thirdparty/libvpx/vp8/common/coefupdateprobs.h +++ b/thirdparty/libvpx/vp8/common/coefupdateprobs.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_COEFUPDATEPROBS_H_ +#define VP8_COMMON_COEFUPDATEPROBS_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP8_COMMON_COEFUPDATEPROBS_H_ -#define VP8_COMMON_COEFUPDATEPROBS_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vp8/common/common.h b/thirdparty/libvpx/vp8/common/common.h index e58a9cc23..2692c8c64 100644 --- a/thirdparty/libvpx/vp8/common/common.h +++ b/thirdparty/libvpx/vp8/common/common.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_COMMON_H_ +#define VP8_COMMON_COMMON_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_COMMON_H_ -#define VP8_COMMON_COMMON_H_ + + #include diff --git a/thirdparty/libvpx/vp8/common/default_coef_probs.h b/thirdparty/libvpx/vp8/common/default_coef_probs.h index 4d69e4be6..0c28e83d0 100644 --- a/thirdparty/libvpx/vp8/common/default_coef_probs.h +++ b/thirdparty/libvpx/vp8/common/default_coef_probs.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_DEFAULT_COEF_PROBS_H_ +#define VP8_COMMON_DEFAULT_COEF_PROBS_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP8_COMMON_DEFAULT_COEF_PROBS_H_ -#define VP8_COMMON_DEFAULT_COEF_PROBS_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vp8/common/entropy.h b/thirdparty/libvpx/vp8/common/entropy.h index a90bab4ba..0be7b1f1c 100644 --- a/thirdparty/libvpx/vp8/common/entropy.h +++ b/thirdparty/libvpx/vp8/common/entropy.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_ENTROPY_H_ +#define VP8_COMMON_ENTROPY_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_ENTROPY_H_ -#define VP8_COMMON_ENTROPY_H_ + + #include "treecoder.h" #include "blockd.h" diff --git a/thirdparty/libvpx/vp8/common/entropymode.h b/thirdparty/libvpx/vp8/common/entropymode.h index 81bdfc4b8..f1a7fb502 100644 --- a/thirdparty/libvpx/vp8/common/entropymode.h +++ b/thirdparty/libvpx/vp8/common/entropymode.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_ENTROPYMODE_H_ +#define VP8_COMMON_ENTROPYMODE_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_ENTROPYMODE_H_ -#define VP8_COMMON_ENTROPYMODE_H_ + + #include "onyxc_int.h" #include "treecoder.h" diff --git a/thirdparty/libvpx/vp8/common/entropymv.h b/thirdparty/libvpx/vp8/common/entropymv.h index 42840d58a..f06431306 100644 --- a/thirdparty/libvpx/vp8/common/entropymv.h +++ b/thirdparty/libvpx/vp8/common/entropymv.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_ENTROPYMV_H_ +#define VP8_COMMON_ENTROPYMV_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_ENTROPYMV_H_ -#define VP8_COMMON_ENTROPYMV_H_ + + #include "treecoder.h" diff --git a/thirdparty/libvpx/vp8/common/extend.h b/thirdparty/libvpx/vp8/common/extend.h index 068f4ac52..889ee286a 100644 --- a/thirdparty/libvpx/vp8/common/extend.h +++ b/thirdparty/libvpx/vp8/common/extend.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_EXTEND_H_ +#define VP8_COMMON_EXTEND_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_EXTEND_H_ -#define VP8_COMMON_EXTEND_H_ + + #include "vpx_scale/yv12config.h" diff --git a/thirdparty/libvpx/vp8/common/filter.h b/thirdparty/libvpx/vp8/common/filter.h index cfba775fc..3d1c78dd1 100644 --- a/thirdparty/libvpx/vp8/common/filter.h +++ b/thirdparty/libvpx/vp8/common/filter.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_FILTER_H_ +#define VP8_COMMON_FILTER_H_ /* * Copyright (c) 2011 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_FILTER_H_ -#define VP8_COMMON_FILTER_H_ + + #include "vpx_ports/mem.h" diff --git a/thirdparty/libvpx/vp8/common/findnearmv.h b/thirdparty/libvpx/vp8/common/findnearmv.h index 472a7b5d8..9dafe0d76 100644 --- a/thirdparty/libvpx/vp8/common/findnearmv.h +++ b/thirdparty/libvpx/vp8/common/findnearmv.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_FINDNEARMV_H_ +#define VP8_COMMON_FINDNEARMV_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_FINDNEARMV_H_ -#define VP8_COMMON_FINDNEARMV_H_ + + #include "./vpx_config.h" #include "mv.h" diff --git a/thirdparty/libvpx/vp8/common/header.h b/thirdparty/libvpx/vp8/common/header.h index e27bca16b..32a21f944 100644 --- a/thirdparty/libvpx/vp8/common/header.h +++ b/thirdparty/libvpx/vp8/common/header.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_HEADER_H_ +#define VP8_COMMON_HEADER_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_HEADER_H_ -#define VP8_COMMON_HEADER_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vp8/common/invtrans.h b/thirdparty/libvpx/vp8/common/invtrans.h index 9cfea8d51..286ea533c 100644 --- a/thirdparty/libvpx/vp8/common/invtrans.h +++ b/thirdparty/libvpx/vp8/common/invtrans.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_INVTRANS_H_ +#define VP8_COMMON_INVTRANS_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_INVTRANS_H_ -#define VP8_COMMON_INVTRANS_H_ + + #include "./vpx_config.h" #include "vp8_rtcd.h" diff --git a/thirdparty/libvpx/vp8/common/loopfilter.h b/thirdparty/libvpx/vp8/common/loopfilter.h index 20a6bd375..2b23c4bf0 100644 --- a/thirdparty/libvpx/vp8/common/loopfilter.h +++ b/thirdparty/libvpx/vp8/common/loopfilter.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_LOOPFILTER_H_ +#define VP8_COMMON_LOOPFILTER_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_LOOPFILTER_H_ -#define VP8_COMMON_LOOPFILTER_H_ + + #include "vpx_ports/mem.h" #include "vpx_config.h" diff --git a/thirdparty/libvpx/vp8/common/modecont.h b/thirdparty/libvpx/vp8/common/modecont.h index ff34c33c5..0970493a9 100644 --- a/thirdparty/libvpx/vp8/common/modecont.h +++ b/thirdparty/libvpx/vp8/common/modecont.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_MODECONT_H_ +#define VP8_COMMON_MODECONT_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_MODECONT_H_ -#define VP8_COMMON_MODECONT_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vp8/common/mv.h b/thirdparty/libvpx/vp8/common/mv.h index 111ccd63c..c4b392753 100644 --- a/thirdparty/libvpx/vp8/common/mv.h +++ b/thirdparty/libvpx/vp8/common/mv.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_MV_H_ +#define VP8_COMMON_MV_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_MV_H_ -#define VP8_COMMON_MV_H_ + + #include "vpx/vpx_integer.h" #ifdef __cplusplus diff --git a/thirdparty/libvpx/vp8/common/onyxc_int.h b/thirdparty/libvpx/vp8/common/onyxc_int.h index 6d89865c6..a497f0fba 100644 --- a/thirdparty/libvpx/vp8/common/onyxc_int.h +++ b/thirdparty/libvpx/vp8/common/onyxc_int.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_ONYXC_INT_H_ +#define VP8_COMMON_ONYXC_INT_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_ONYXC_INT_H_ -#define VP8_COMMON_ONYXC_INT_H_ + + #include "vpx_config.h" #include "vp8_rtcd.h" diff --git a/thirdparty/libvpx/vp8/common/onyxd.h b/thirdparty/libvpx/vp8/common/onyxd.h index e37b29f32..b05bac9e2 100644 --- a/thirdparty/libvpx/vp8/common/onyxd.h +++ b/thirdparty/libvpx/vp8/common/onyxd.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_ONYXD_H_ +#define VP8_COMMON_ONYXD_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_ONYXD_H_ -#define VP8_COMMON_ONYXD_H_ + + /* Create/destroy static data structures. */ diff --git a/thirdparty/libvpx/vp8/common/ppflags.h b/thirdparty/libvpx/vp8/common/ppflags.h index 768224aad..32fde82aa 100644 --- a/thirdparty/libvpx/vp8/common/ppflags.h +++ b/thirdparty/libvpx/vp8/common/ppflags.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_PPFLAGS_H_ +#define VP8_COMMON_PPFLAGS_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_PPFLAGS_H_ -#define VP8_COMMON_PPFLAGS_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vp8/common/quant_common.h b/thirdparty/libvpx/vp8/common/quant_common.h index 700b5e6d7..955ebb3ed 100644 --- a/thirdparty/libvpx/vp8/common/quant_common.h +++ b/thirdparty/libvpx/vp8/common/quant_common.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_QUANT_COMMON_H_ +#define VP8_COMMON_QUANT_COMMON_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP8_COMMON_QUANT_COMMON_H_ -#define VP8_COMMON_QUANT_COMMON_H_ + + #include "string.h" diff --git a/thirdparty/libvpx/vp8/common/reconinter.h b/thirdparty/libvpx/vp8/common/reconinter.h index ba979b966..1fff28eea 100644 --- a/thirdparty/libvpx/vp8/common/reconinter.h +++ b/thirdparty/libvpx/vp8/common/reconinter.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_RECONINTER_H_ +#define VP8_COMMON_RECONINTER_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_RECONINTER_H_ -#define VP8_COMMON_RECONINTER_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vp8/common/reconintra.h b/thirdparty/libvpx/vp8/common/reconintra.h index b6225a663..3cba3830a 100644 --- a/thirdparty/libvpx/vp8/common/reconintra.h +++ b/thirdparty/libvpx/vp8/common/reconintra.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_RECONINTRA_H_ +#define VP8_COMMON_RECONINTRA_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_RECONINTRA_H_ -#define VP8_COMMON_RECONINTRA_H_ + + #include "vp8/common/blockd.h" diff --git a/thirdparty/libvpx/vp8/common/reconintra4x4.h b/thirdparty/libvpx/vp8/common/reconintra4x4.h index 5dc5d13a5..42bea11f2 100644 --- a/thirdparty/libvpx/vp8/common/reconintra4x4.h +++ b/thirdparty/libvpx/vp8/common/reconintra4x4.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_RECONINTRA4X4_H_ +#define VP8_COMMON_RECONINTRA4X4_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_RECONINTRA4X4_H_ -#define VP8_COMMON_RECONINTRA4X4_H_ + + #include "vp8/common/blockd.h" #ifdef __cplusplus diff --git a/thirdparty/libvpx/vp8/common/setupintrarecon.h b/thirdparty/libvpx/vp8/common/setupintrarecon.h index 1857c4e26..28a6a9d65 100644 --- a/thirdparty/libvpx/vp8/common/setupintrarecon.h +++ b/thirdparty/libvpx/vp8/common/setupintrarecon.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_SETUPINTRARECON_H_ +#define VP8_COMMON_SETUPINTRARECON_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP8_COMMON_SETUPINTRARECON_H_ -#define VP8_COMMON_SETUPINTRARECON_H_ + + #include "./vpx_config.h" #include "vpx_scale/yv12config.h" diff --git a/thirdparty/libvpx/vp8/common/swapyv12buffer.h b/thirdparty/libvpx/vp8/common/swapyv12buffer.h index 1d66cd3d6..17f964237 100644 --- a/thirdparty/libvpx/vp8/common/swapyv12buffer.h +++ b/thirdparty/libvpx/vp8/common/swapyv12buffer.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_SWAPYV12BUFFER_H_ +#define VP8_COMMON_SWAPYV12BUFFER_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_SWAPYV12BUFFER_H_ -#define VP8_COMMON_SWAPYV12BUFFER_H_ + + #include "vpx_scale/yv12config.h" diff --git a/thirdparty/libvpx/vp8/common/systemdependent.h b/thirdparty/libvpx/vp8/common/systemdependent.h index 3d44e37cf..76733c834 100644 --- a/thirdparty/libvpx/vp8/common/systemdependent.h +++ b/thirdparty/libvpx/vp8/common/systemdependent.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_SYSTEMDEPENDENT_H_ +#define VP8_COMMON_SYSTEMDEPENDENT_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP8_COMMON_SYSTEMDEPENDENT_H_ -#define VP8_COMMON_SYSTEMDEPENDENT_H_ + + #include "vpx_config.h" diff --git a/thirdparty/libvpx/vp8/common/threading.h b/thirdparty/libvpx/vp8/common/threading.h index 183b49b8f..cf3b2cb25 100644 --- a/thirdparty/libvpx/vp8/common/threading.h +++ b/thirdparty/libvpx/vp8/common/threading.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_THREADING_H_ +#define VP8_COMMON_THREADING_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_THREADING_H_ -#define VP8_COMMON_THREADING_H_ + + #include "./vpx_config.h" diff --git a/thirdparty/libvpx/vp8/common/treecoder.h b/thirdparty/libvpx/vp8/common/treecoder.h index d22b7c570..0669ef7c8 100644 --- a/thirdparty/libvpx/vp8/common/treecoder.h +++ b/thirdparty/libvpx/vp8/common/treecoder.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_TREECODER_H_ +#define VP8_COMMON_TREECODER_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_COMMON_TREECODER_H_ -#define VP8_COMMON_TREECODER_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vp8/common/vp8_entropymodedata.h b/thirdparty/libvpx/vp8/common/vp8_entropymodedata.h index c4aed4989..cb1c7ec5a 100644 --- a/thirdparty/libvpx/vp8/common/vp8_entropymodedata.h +++ b/thirdparty/libvpx/vp8/common/vp8_entropymodedata.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_VP8_ENTROPYMODEDATA_H_ +#define VP8_COMMON_VP8_ENTROPYMODEDATA_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP8_COMMON_VP8_ENTROPYMODEDATA_H_ -#define VP8_COMMON_VP8_ENTROPYMODEDATA_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vp8/common/x86/filter_x86.h b/thirdparty/libvpx/vp8/common/x86/filter_x86.h index d282841be..95753ed58 100644 --- a/thirdparty/libvpx/vp8/common/x86/filter_x86.h +++ b/thirdparty/libvpx/vp8/common/x86/filter_x86.h @@ -1,3 +1,5 @@ +#ifndef VP8_COMMON_X86_FILTER_X86_H_ +#define VP8_COMMON_X86_FILTER_X86_H_ /* * Copyright (c) 2011 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP8_COMMON_X86_FILTER_X86_H_ -#define VP8_COMMON_X86_FILTER_X86_H_ + + #include "vpx_ports/mem.h" diff --git a/thirdparty/libvpx/vp8/decoder/dboolhuff.h b/thirdparty/libvpx/vp8/decoder/dboolhuff.h index 1b1bbf868..3510632dc 100644 --- a/thirdparty/libvpx/vp8/decoder/dboolhuff.h +++ b/thirdparty/libvpx/vp8/decoder/dboolhuff.h @@ -1,3 +1,5 @@ +#ifndef VP8_DECODER_DBOOLHUFF_H_ +#define VP8_DECODER_DBOOLHUFF_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_DECODER_DBOOLHUFF_H_ -#define VP8_DECODER_DBOOLHUFF_H_ + + #include #include diff --git a/thirdparty/libvpx/vp8/decoder/decodemv.h b/thirdparty/libvpx/vp8/decoder/decodemv.h index f33b07351..ac5de334c 100644 --- a/thirdparty/libvpx/vp8/decoder/decodemv.h +++ b/thirdparty/libvpx/vp8/decoder/decodemv.h @@ -1,3 +1,5 @@ +#ifndef VP8_DECODER_DECODEMV_H_ +#define VP8_DECODER_DECODEMV_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP8_DECODER_DECODEMV_H_ -#define VP8_DECODER_DECODEMV_H_ + + #include "onyxd_int.h" diff --git a/thirdparty/libvpx/vp8/decoder/decoderthreading.h b/thirdparty/libvpx/vp8/decoder/decoderthreading.h index c563cf6e9..b11ae8cf1 100644 --- a/thirdparty/libvpx/vp8/decoder/decoderthreading.h +++ b/thirdparty/libvpx/vp8/decoder/decoderthreading.h @@ -1,3 +1,5 @@ +#ifndef VP8_DECODER_DECODERTHREADING_H_ +#define VP8_DECODER_DECODERTHREADING_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP8_DECODER_DECODERTHREADING_H_ -#define VP8_DECODER_DECODERTHREADING_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vp8/decoder/detokenize.h b/thirdparty/libvpx/vp8/decoder/detokenize.h index f0b125444..f2ccfd550 100644 --- a/thirdparty/libvpx/vp8/decoder/detokenize.h +++ b/thirdparty/libvpx/vp8/decoder/detokenize.h @@ -1,3 +1,5 @@ +#ifndef VP8_DECODER_DETOKENIZE_H_ +#define VP8_DECODER_DETOKENIZE_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP8_DECODER_DETOKENIZE_H_ -#define VP8_DECODER_DETOKENIZE_H_ + + #include "onyxd_int.h" diff --git a/thirdparty/libvpx/vp8/decoder/onyxd_int.h b/thirdparty/libvpx/vp8/decoder/onyxd_int.h index 313fe01c0..63ae01b4d 100644 --- a/thirdparty/libvpx/vp8/decoder/onyxd_int.h +++ b/thirdparty/libvpx/vp8/decoder/onyxd_int.h @@ -1,3 +1,5 @@ +#ifndef VP8_DECODER_ONYXD_INT_H_ +#define VP8_DECODER_ONYXD_INT_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_DECODER_ONYXD_INT_H_ -#define VP8_DECODER_ONYXD_INT_H_ + + #include "vpx_config.h" #include "vp8/common/onyxd.h" diff --git a/thirdparty/libvpx/vp8/decoder/treereader.h b/thirdparty/libvpx/vp8/decoder/treereader.h index f7d23c369..cae242d71 100644 --- a/thirdparty/libvpx/vp8/decoder/treereader.h +++ b/thirdparty/libvpx/vp8/decoder/treereader.h @@ -1,3 +1,5 @@ +#ifndef VP8_DECODER_TREEREADER_H_ +#define VP8_DECODER_TREEREADER_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP8_DECODER_TREEREADER_H_ -#define VP8_DECODER_TREEREADER_H_ + + #include "./vpx_config.h" #include "vp8/common/treecoder.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_alloccommon.h b/thirdparty/libvpx/vp9/common/vp9_alloccommon.h index e53955b99..b8ae4e9cd 100644 --- a/thirdparty/libvpx/vp9/common/vp9_alloccommon.h +++ b/thirdparty/libvpx/vp9/common/vp9_alloccommon.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_ALLOCCOMMON_H_ +#define VP9_COMMON_VP9_ALLOCCOMMON_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP9_COMMON_VP9_ALLOCCOMMON_H_ -#define VP9_COMMON_VP9_ALLOCCOMMON_H_ + + #define INVALID_IDX -1 // Invalid buffer index. diff --git a/thirdparty/libvpx/vp9/common/vp9_blockd.h b/thirdparty/libvpx/vp9/common/vp9_blockd.h index 3d26fb2b5..a78e734e4 100644 --- a/thirdparty/libvpx/vp9/common/vp9_blockd.h +++ b/thirdparty/libvpx/vp9/common/vp9_blockd.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_BLOCKD_H_ +#define VP9_COMMON_VP9_BLOCKD_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP9_COMMON_VP9_BLOCKD_H_ -#define VP9_COMMON_VP9_BLOCKD_H_ + + #include "./vpx_config.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_common.h b/thirdparty/libvpx/vp9/common/vp9_common.h index 908fa80a3..5b5fa045e 100644 --- a/thirdparty/libvpx/vp9/common/vp9_common.h +++ b/thirdparty/libvpx/vp9/common/vp9_common.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_COMMON_H_ +#define VP9_COMMON_VP9_COMMON_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_COMMON_H_ -#define VP9_COMMON_VP9_COMMON_H_ + + /* Interface header for common constant data structures and lookup tables */ diff --git a/thirdparty/libvpx/vp9/common/vp9_common_data.h b/thirdparty/libvpx/vp9/common/vp9_common_data.h index 0ae24dad5..5c66dab03 100644 --- a/thirdparty/libvpx/vp9/common/vp9_common_data.h +++ b/thirdparty/libvpx/vp9/common/vp9_common_data.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_COMMON_DATA_H_ +#define VP9_COMMON_VP9_COMMON_DATA_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_COMMON_DATA_H_ -#define VP9_COMMON_VP9_COMMON_DATA_H_ + + #include "vp9/common/vp9_enums.h" #include "vpx/vpx_integer.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_entropy.h b/thirdparty/libvpx/vp9/common/vp9_entropy.h index 63b3bff5d..1d2b03923 100644 --- a/thirdparty/libvpx/vp9/common/vp9_entropy.h +++ b/thirdparty/libvpx/vp9/common/vp9_entropy.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_ENTROPY_H_ +#define VP9_COMMON_VP9_ENTROPY_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_ENTROPY_H_ -#define VP9_COMMON_VP9_ENTROPY_H_ + + #include "vpx/vpx_integer.h" #include "vpx_dsp/prob.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_entropymode.h b/thirdparty/libvpx/vp9/common/vp9_entropymode.h index 0285be155..f5afb9be4 100644 --- a/thirdparty/libvpx/vp9/common/vp9_entropymode.h +++ b/thirdparty/libvpx/vp9/common/vp9_entropymode.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_ENTROPYMODE_H_ +#define VP9_COMMON_VP9_ENTROPYMODE_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_ENTROPYMODE_H_ -#define VP9_COMMON_VP9_ENTROPYMODE_H_ + + #include "vp9/common/vp9_entropy.h" #include "vp9/common/vp9_entropymv.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_entropymv.h b/thirdparty/libvpx/vp9/common/vp9_entropymv.h index 2f05ad44b..e13a6af93 100644 --- a/thirdparty/libvpx/vp9/common/vp9_entropymv.h +++ b/thirdparty/libvpx/vp9/common/vp9_entropymv.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_ENTROPYMV_H_ +#define VP9_COMMON_VP9_ENTROPYMV_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP9_COMMON_VP9_ENTROPYMV_H_ -#define VP9_COMMON_VP9_ENTROPYMV_H_ + + #include "./vpx_config.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_enums.h b/thirdparty/libvpx/vp9/common/vp9_enums.h index d089f23f9..f2150bc7a 100644 --- a/thirdparty/libvpx/vp9/common/vp9_enums.h +++ b/thirdparty/libvpx/vp9/common/vp9_enums.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_ENUMS_H_ +#define VP9_COMMON_VP9_ENUMS_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_ENUMS_H_ -#define VP9_COMMON_VP9_ENUMS_H_ + + #include "./vpx_config.h" #include "vpx/vpx_integer.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_filter.h b/thirdparty/libvpx/vp9/common/vp9_filter.h index efa24bc67..9b9280f41 100644 --- a/thirdparty/libvpx/vp9/common/vp9_filter.h +++ b/thirdparty/libvpx/vp9/common/vp9_filter.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_FILTER_H_ +#define VP9_COMMON_VP9_FILTER_H_ /* * Copyright (c) 2011 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_FILTER_H_ -#define VP9_COMMON_VP9_FILTER_H_ + + #include "./vpx_config.h" #include "vpx/vpx_integer.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_frame_buffers.h b/thirdparty/libvpx/vp9/common/vp9_frame_buffers.h index e2cfe61b6..0508406c4 100644 --- a/thirdparty/libvpx/vp9/common/vp9_frame_buffers.h +++ b/thirdparty/libvpx/vp9/common/vp9_frame_buffers.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_FRAME_BUFFERS_H_ +#define VP9_COMMON_VP9_FRAME_BUFFERS_H_ /* * Copyright (c) 2014 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_FRAME_BUFFERS_H_ -#define VP9_COMMON_VP9_FRAME_BUFFERS_H_ + + #include "vpx/vpx_frame_buffer.h" #include "vpx/vpx_integer.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_idct.h b/thirdparty/libvpx/vp9/common/vp9_idct.h index b5a3fbf36..4fee6dc1e 100644 --- a/thirdparty/libvpx/vp9/common/vp9_idct.h +++ b/thirdparty/libvpx/vp9/common/vp9_idct.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_IDCT_H_ +#define VP9_COMMON_VP9_IDCT_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_IDCT_H_ -#define VP9_COMMON_VP9_IDCT_H_ + + #include diff --git a/thirdparty/libvpx/vp9/common/vp9_loopfilter.h b/thirdparty/libvpx/vp9/common/vp9_loopfilter.h index fca8830fa..40dfc1d70 100644 --- a/thirdparty/libvpx/vp9/common/vp9_loopfilter.h +++ b/thirdparty/libvpx/vp9/common/vp9_loopfilter.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_LOOPFILTER_H_ +#define VP9_COMMON_VP9_LOOPFILTER_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_LOOPFILTER_H_ -#define VP9_COMMON_VP9_LOOPFILTER_H_ + + #include "vpx_ports/mem.h" #include "./vpx_config.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_mv.h b/thirdparty/libvpx/vp9/common/vp9_mv.h index 5d89da8c2..0949e7fd9 100644 --- a/thirdparty/libvpx/vp9/common/vp9_mv.h +++ b/thirdparty/libvpx/vp9/common/vp9_mv.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_MV_H_ +#define VP9_COMMON_VP9_MV_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_MV_H_ -#define VP9_COMMON_VP9_MV_H_ + + #include "vpx/vpx_integer.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_mvref_common.h b/thirdparty/libvpx/vp9/common/vp9_mvref_common.h index 4380843e2..8f73decff 100644 --- a/thirdparty/libvpx/vp9/common/vp9_mvref_common.h +++ b/thirdparty/libvpx/vp9/common/vp9_mvref_common.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_MVREF_COMMON_H_ +#define VP9_COMMON_VP9_MVREF_COMMON_H_ /* * Copyright (c) 2012 The WebM project authors. All Rights Reserved. * @@ -7,8 +9,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_MVREF_COMMON_H_ -#define VP9_COMMON_VP9_MVREF_COMMON_H_ + + #include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_blockd.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_onyxc_int.h b/thirdparty/libvpx/vp9/common/vp9_onyxc_int.h index 3fd935e62..843b5525d 100644 --- a/thirdparty/libvpx/vp9/common/vp9_onyxc_int.h +++ b/thirdparty/libvpx/vp9/common/vp9_onyxc_int.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_ONYXC_INT_H_ +#define VP9_COMMON_VP9_ONYXC_INT_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_ONYXC_INT_H_ -#define VP9_COMMON_VP9_ONYXC_INT_H_ + + #include "./vpx_config.h" #include "vpx/internal/vpx_codec_internal.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_ppflags.h b/thirdparty/libvpx/vp9/common/vp9_ppflags.h index 12b989f43..f8da8d2b7 100644 --- a/thirdparty/libvpx/vp9/common/vp9_ppflags.h +++ b/thirdparty/libvpx/vp9/common/vp9_ppflags.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_PPFLAGS_H_ +#define VP9_COMMON_VP9_PPFLAGS_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_PPFLAGS_H_ -#define VP9_COMMON_VP9_PPFLAGS_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vp9/common/vp9_pred_common.h b/thirdparty/libvpx/vp9/common/vp9_pred_common.h index f3c676e95..99592c8e7 100644 --- a/thirdparty/libvpx/vp9/common/vp9_pred_common.h +++ b/thirdparty/libvpx/vp9/common/vp9_pred_common.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_PRED_COMMON_H_ +#define VP9_COMMON_VP9_PRED_COMMON_H_ /* * Copyright (c) 2012 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_PRED_COMMON_H_ -#define VP9_COMMON_VP9_PRED_COMMON_H_ + + #include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_onyxc_int.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_quant_common.h b/thirdparty/libvpx/vp9/common/vp9_quant_common.h index 4bae4a896..5351b9e23 100644 --- a/thirdparty/libvpx/vp9/common/vp9_quant_common.h +++ b/thirdparty/libvpx/vp9/common/vp9_quant_common.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_QUANT_COMMON_H_ +#define VP9_COMMON_VP9_QUANT_COMMON_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_QUANT_COMMON_H_ -#define VP9_COMMON_VP9_QUANT_COMMON_H_ + + #include "vpx/vpx_codec.h" #include "vp9/common/vp9_seg_common.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_reconinter.h b/thirdparty/libvpx/vp9/common/vp9_reconinter.h index 07745e3aa..688f2d7b2 100644 --- a/thirdparty/libvpx/vp9/common/vp9_reconinter.h +++ b/thirdparty/libvpx/vp9/common/vp9_reconinter.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_RECONINTER_H_ +#define VP9_COMMON_VP9_RECONINTER_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_RECONINTER_H_ -#define VP9_COMMON_VP9_RECONINTER_H_ + + #include "vp9/common/vp9_filter.h" #include "vp9/common/vp9_onyxc_int.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_reconintra.h b/thirdparty/libvpx/vp9/common/vp9_reconintra.h index de453808b..c9afb2835 100644 --- a/thirdparty/libvpx/vp9/common/vp9_reconintra.h +++ b/thirdparty/libvpx/vp9/common/vp9_reconintra.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_RECONINTRA_H_ +#define VP9_COMMON_VP9_RECONINTRA_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_RECONINTRA_H_ -#define VP9_COMMON_VP9_RECONINTRA_H_ + + #include "vpx/vpx_integer.h" #include "vp9/common/vp9_blockd.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_scale.h b/thirdparty/libvpx/vp9/common/vp9_scale.h index 5e9104107..0581c08fc 100644 --- a/thirdparty/libvpx/vp9/common/vp9_scale.h +++ b/thirdparty/libvpx/vp9/common/vp9_scale.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_SCALE_H_ +#define VP9_COMMON_VP9_SCALE_H_ /* * Copyright (c) 2013 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_SCALE_H_ -#define VP9_COMMON_VP9_SCALE_H_ + + #include "vp9/common/vp9_mv.h" #include "vpx_dsp/vpx_convolve.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_scan.h b/thirdparty/libvpx/vp9/common/vp9_scan.h index 4c1ee8107..069bd1721 100644 --- a/thirdparty/libvpx/vp9/common/vp9_scan.h +++ b/thirdparty/libvpx/vp9/common/vp9_scan.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_SCAN_H_ +#define VP9_COMMON_VP9_SCAN_H_ /* * Copyright (c) 2013 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_SCAN_H_ -#define VP9_COMMON_VP9_SCAN_H_ + + #include "vpx/vpx_integer.h" #include "vpx_ports/mem.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_seg_common.h b/thirdparty/libvpx/vp9/common/vp9_seg_common.h index 99a9440c1..bd9e991e4 100644 --- a/thirdparty/libvpx/vp9/common/vp9_seg_common.h +++ b/thirdparty/libvpx/vp9/common/vp9_seg_common.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_SEG_COMMON_H_ +#define VP9_COMMON_VP9_SEG_COMMON_H_ /* * Copyright (c) 2012 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_SEG_COMMON_H_ -#define VP9_COMMON_VP9_SEG_COMMON_H_ + + #include "vpx_dsp/prob.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_thread_common.h b/thirdparty/libvpx/vp9/common/vp9_thread_common.h index b3b60c253..cee487752 100644 --- a/thirdparty/libvpx/vp9/common/vp9_thread_common.h +++ b/thirdparty/libvpx/vp9/common/vp9_thread_common.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_THREAD_COMMON_H_ +#define VP9_COMMON_VP9_THREAD_COMMON_H_ /* * Copyright (c) 2014 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_THREAD_COMMON_H_ -#define VP9_COMMON_VP9_THREAD_COMMON_H_ + + #include "./vpx_config.h" #include "vp9/common/vp9_loopfilter.h" #include "vpx_util/vpx_thread.h" diff --git a/thirdparty/libvpx/vp9/common/vp9_tile_common.h b/thirdparty/libvpx/vp9/common/vp9_tile_common.h index ae58805de..03eadf74d 100644 --- a/thirdparty/libvpx/vp9/common/vp9_tile_common.h +++ b/thirdparty/libvpx/vp9/common/vp9_tile_common.h @@ -1,3 +1,5 @@ +#ifndef VP9_COMMON_VP9_TILE_COMMON_H_ +#define VP9_COMMON_VP9_TILE_COMMON_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_TILE_COMMON_H_ -#define VP9_COMMON_VP9_TILE_COMMON_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vp9/decoder/vp9_decodeframe.h b/thirdparty/libvpx/vp9/decoder/vp9_decodeframe.h index ce33cbdbd..0c300cc80 100644 --- a/thirdparty/libvpx/vp9/decoder/vp9_decodeframe.h +++ b/thirdparty/libvpx/vp9/decoder/vp9_decodeframe.h @@ -1,3 +1,5 @@ +#ifndef VP9_DECODER_VP9_DECODEFRAME_H_ +#define VP9_DECODER_VP9_DECODEFRAME_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP9_DECODER_VP9_DECODEFRAME_H_ -#define VP9_DECODER_VP9_DECODEFRAME_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vp9/decoder/vp9_decodemv.h b/thirdparty/libvpx/vp9/decoder/vp9_decodemv.h index 45569ec81..f1f367db7 100644 --- a/thirdparty/libvpx/vp9/decoder/vp9_decodemv.h +++ b/thirdparty/libvpx/vp9/decoder/vp9_decodemv.h @@ -1,3 +1,5 @@ +#ifndef VP9_DECODER_VP9_DECODEMV_H_ +#define VP9_DECODER_VP9_DECODEMV_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_DECODER_VP9_DECODEMV_H_ -#define VP9_DECODER_VP9_DECODEMV_H_ + + #include "vpx_dsp/bitreader.h" diff --git a/thirdparty/libvpx/vp9/decoder/vp9_decoder.h b/thirdparty/libvpx/vp9/decoder/vp9_decoder.h index 7111a36d3..32bbc8292 100644 --- a/thirdparty/libvpx/vp9/decoder/vp9_decoder.h +++ b/thirdparty/libvpx/vp9/decoder/vp9_decoder.h @@ -1,3 +1,5 @@ +#ifndef VP9_DECODER_VP9_DECODER_H_ +#define VP9_DECODER_VP9_DECODER_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_DECODER_VP9_DECODER_H_ -#define VP9_DECODER_VP9_DECODER_H_ + + #include "./vpx_config.h" diff --git a/thirdparty/libvpx/vp9/decoder/vp9_detokenize.h b/thirdparty/libvpx/vp9/decoder/vp9_detokenize.h index d242d4466..b9e17f638 100644 --- a/thirdparty/libvpx/vp9/decoder/vp9_detokenize.h +++ b/thirdparty/libvpx/vp9/decoder/vp9_detokenize.h @@ -1,3 +1,5 @@ +#ifndef VP9_DECODER_VP9_DETOKENIZE_H_ +#define VP9_DECODER_VP9_DETOKENIZE_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP9_DECODER_VP9_DETOKENIZE_H_ -#define VP9_DECODER_VP9_DETOKENIZE_H_ + + #include "vpx_dsp/bitreader.h" #include "vp9/decoder/vp9_decoder.h" diff --git a/thirdparty/libvpx/vp9/decoder/vp9_dsubexp.h b/thirdparty/libvpx/vp9/decoder/vp9_dsubexp.h index a8bcc70be..4306ecbe4 100644 --- a/thirdparty/libvpx/vp9/decoder/vp9_dsubexp.h +++ b/thirdparty/libvpx/vp9/decoder/vp9_dsubexp.h @@ -1,3 +1,5 @@ +#ifndef VP9_DECODER_VP9_DSUBEXP_H_ +#define VP9_DECODER_VP9_DSUBEXP_H_ /* * Copyright (c) 2013 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VP9_DECODER_VP9_DSUBEXP_H_ -#define VP9_DECODER_VP9_DSUBEXP_H_ + + #include "vpx_dsp/bitreader.h" diff --git a/thirdparty/libvpx/vp9/decoder/vp9_dthread.h b/thirdparty/libvpx/vp9/decoder/vp9_dthread.h index ba7c38a51..9c1605934 100644 --- a/thirdparty/libvpx/vp9/decoder/vp9_dthread.h +++ b/thirdparty/libvpx/vp9/decoder/vp9_dthread.h @@ -1,3 +1,5 @@ +#ifndef VP9_DECODER_VP9_DTHREAD_H_ +#define VP9_DECODER_VP9_DTHREAD_H_ /* * Copyright (c) 2014 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_DECODER_VP9_DTHREAD_H_ -#define VP9_DECODER_VP9_DTHREAD_H_ + + #include "./vpx_config.h" #include "vpx_util/vpx_thread.h" diff --git a/thirdparty/libvpx/vp9/vp9_dx_iface.h b/thirdparty/libvpx/vp9/vp9_dx_iface.h index e0e948e16..edfedebfe 100644 --- a/thirdparty/libvpx/vp9/vp9_dx_iface.h +++ b/thirdparty/libvpx/vp9/vp9_dx_iface.h @@ -1,3 +1,5 @@ +#ifndef VP9_VP9_DX_IFACE_H_ +#define VP9_VP9_DX_IFACE_H_ /* * Copyright (c) 2015 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_VP9_DX_IFACE_H_ -#define VP9_VP9_DX_IFACE_H_ + + #include "vp9/decoder/vp9_decoder.h" diff --git a/thirdparty/libvpx/vp9/vp9_iface_common.h b/thirdparty/libvpx/vp9/vp9_iface_common.h index 938d4224b..1b8dd4a35 100644 --- a/thirdparty/libvpx/vp9/vp9_iface_common.h +++ b/thirdparty/libvpx/vp9/vp9_iface_common.h @@ -1,3 +1,5 @@ +#ifndef VP9_VP9_IFACE_COMMON_H_ +#define VP9_VP9_IFACE_COMMON_H_ /* * Copyright (c) 2013 The WebM project authors. All Rights Reserved. * @@ -7,8 +9,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_VP9_IFACE_COMMON_H_ -#define VP9_VP9_IFACE_COMMON_H_ + + #include "vpx_ports/mem.h" diff --git a/thirdparty/libvpx/vpx/internal/vpx_codec_internal.h b/thirdparty/libvpx/vpx/internal/vpx_codec_internal.h index 7380fcc7e..3d5f768f5 100644 --- a/thirdparty/libvpx/vpx/internal/vpx_codec_internal.h +++ b/thirdparty/libvpx/vpx/internal/vpx_codec_internal.h @@ -1,3 +1,5 @@ +#ifndef VPX_INTERNAL_VPX_CODEC_INTERNAL_H_ +#define VPX_INTERNAL_VPX_CODEC_INTERNAL_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -41,8 +43,8 @@ * Once initialized, the instance is manged using other functions from * the vpx_codec_* family. */ -#ifndef VPX_INTERNAL_VPX_CODEC_INTERNAL_H_ -#define VPX_INTERNAL_VPX_CODEC_INTERNAL_H_ + + #include "../vpx_decoder.h" #include "../vpx_encoder.h" #include diff --git a/thirdparty/libvpx/vpx/internal/vpx_psnr.h b/thirdparty/libvpx/vpx/internal/vpx_psnr.h index 07d81bb8d..19b7edeee 100644 --- a/thirdparty/libvpx/vpx/internal/vpx_psnr.h +++ b/thirdparty/libvpx/vpx/internal/vpx_psnr.h @@ -1,3 +1,5 @@ +#ifndef VPX_INTERNAL_VPX_PSNR_H_ +#define VPX_INTERNAL_VPX_PSNR_H_ /* * Copyright (c) 2014 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_INTERNAL_VPX_PSNR_H_ -#define VPX_INTERNAL_VPX_PSNR_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vpx/vp8.h b/thirdparty/libvpx/vpx/vp8.h index 8a035f977..62fe01a01 100644 --- a/thirdparty/libvpx/vpx/vp8.h +++ b/thirdparty/libvpx/vpx/vp8.h @@ -1,3 +1,5 @@ +#ifndef VPX_VP8_H_ +#define VPX_VP8_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -27,8 +29,8 @@ /*!\file * \brief Provides controls common to both the VP8 encoder and decoder. */ -#ifndef VPX_VP8_H_ -#define VPX_VP8_H_ + + #include "./vpx_codec.h" #include "./vpx_image.h" diff --git a/thirdparty/libvpx/vpx/vp8dx.h b/thirdparty/libvpx/vpx/vp8dx.h index 67c97bb6c..6d3dda714 100644 --- a/thirdparty/libvpx/vpx/vp8dx.h +++ b/thirdparty/libvpx/vpx/vp8dx.h @@ -1,3 +1,5 @@ +#ifndef VPX_VP8DX_H_ +#define VPX_VP8DX_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -18,8 +20,8 @@ * \brief Provides definitions for using VP8 or VP9 within the vpx Decoder * interface. */ -#ifndef VPX_VP8DX_H_ -#define VPX_VP8DX_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vpx/vpx_codec.h b/thirdparty/libvpx/vpx/vpx_codec.h index b6037bb4d..77240ad5e 100644 --- a/thirdparty/libvpx/vpx/vpx_codec.h +++ b/thirdparty/libvpx/vpx/vpx_codec.h @@ -1,3 +1,5 @@ +#ifndef VPX_VPX_CODEC_H_ +#define VPX_VPX_CODEC_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -36,8 +38,8 @@ * Once initialized, the instance is manged using other functions from * the vpx_codec_* family. */ -#ifndef VPX_VPX_CODEC_H_ -#define VPX_VPX_CODEC_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vpx/vpx_decoder.h b/thirdparty/libvpx/vpx/vpx_decoder.h index 62fd91975..12d602964 100644 --- a/thirdparty/libvpx/vpx/vpx_decoder.h +++ b/thirdparty/libvpx/vpx/vpx_decoder.h @@ -1,3 +1,5 @@ +#ifndef VPX_VPX_DECODER_H_ +#define VPX_VPX_DECODER_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -7,8 +9,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_VPX_DECODER_H_ -#define VPX_VPX_DECODER_H_ + + /*!\defgroup decoder Decoder Algorithm Interface * \ingroup codec diff --git a/thirdparty/libvpx/vpx/vpx_encoder.h b/thirdparty/libvpx/vpx/vpx_encoder.h index 955e87351..06b7c4613 100644 --- a/thirdparty/libvpx/vpx/vpx_encoder.h +++ b/thirdparty/libvpx/vpx/vpx_encoder.h @@ -1,3 +1,5 @@ +#ifndef VPX_VPX_ENCODER_H_ +#define VPX_VPX_ENCODER_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -7,8 +9,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_VPX_ENCODER_H_ -#define VPX_VPX_ENCODER_H_ + + /*!\defgroup encoder Encoder Algorithm Interface * \ingroup codec diff --git a/thirdparty/libvpx/vpx/vpx_frame_buffer.h b/thirdparty/libvpx/vpx/vpx_frame_buffer.h index 9036459af..9182f6aa2 100644 --- a/thirdparty/libvpx/vpx/vpx_frame_buffer.h +++ b/thirdparty/libvpx/vpx/vpx_frame_buffer.h @@ -1,3 +1,5 @@ +#ifndef VPX_VPX_FRAME_BUFFER_H_ +#define VPX_VPX_FRAME_BUFFER_H_ /* * Copyright (c) 2014 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_VPX_FRAME_BUFFER_H_ -#define VPX_VPX_FRAME_BUFFER_H_ + + /*!\file * \brief Describes the decoder external frame buffer interface. diff --git a/thirdparty/libvpx/vpx/vpx_image.h b/thirdparty/libvpx/vpx/vpx_image.h index 7958c6980..00a9cc946 100644 --- a/thirdparty/libvpx/vpx/vpx_image.h +++ b/thirdparty/libvpx/vpx/vpx_image.h @@ -1,3 +1,5 @@ +#ifndef VPX_VPX_IMAGE_H_ +#define VPX_VPX_IMAGE_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -13,8 +15,8 @@ * \brief Describes the vpx image descriptor and associated operations * */ -#ifndef VPX_VPX_IMAGE_H_ -#define VPX_VPX_IMAGE_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vpx/vpx_integer.h b/thirdparty/libvpx/vpx/vpx_integer.h index 829c9d132..fcab571c8 100644 --- a/thirdparty/libvpx/vpx/vpx_integer.h +++ b/thirdparty/libvpx/vpx/vpx_integer.h @@ -1,3 +1,5 @@ +#ifndef VPX_VPX_INTEGER_H_ +#define VPX_VPX_INTEGER_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VPX_VPX_INTEGER_H_ -#define VPX_VPX_INTEGER_H_ + + /* get ptrdiff_t, size_t, wchar_t, NULL */ #include diff --git a/thirdparty/libvpx/vpx_config.h b/thirdparty/libvpx/vpx_config.h index e8e91fa6e..c8c9c9e96 100644 --- a/thirdparty/libvpx/vpx_config.h +++ b/thirdparty/libvpx/vpx_config.h @@ -1,3 +1,5 @@ +#ifndef VPX_CONFIG_H +#define VPX_CONFIG_H /* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */ /* */ /* Use of this source code is governed by a BSD-style license */ @@ -6,8 +8,8 @@ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ /* This file automatically generated by configure. Do not edit! */ -#ifndef VPX_CONFIG_H -#define VPX_CONFIG_H + + #define RESTRICT #if defined(_MSC_VER) && (_MSC_VER < 1900) #define INLINE __inline diff --git a/thirdparty/libvpx/vpx_dsp/bitreader.h b/thirdparty/libvpx/vpx_dsp/bitreader.h index 9a441b410..89c362dca 100644 --- a/thirdparty/libvpx/vpx_dsp/bitreader.h +++ b/thirdparty/libvpx/vpx_dsp/bitreader.h @@ -1,3 +1,5 @@ +#ifndef VPX_DSP_BITREADER_H_ +#define VPX_DSP_BITREADER_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_DSP_BITREADER_H_ -#define VPX_DSP_BITREADER_H_ + + #include #include diff --git a/thirdparty/libvpx/vpx_dsp/bitreader_buffer.h b/thirdparty/libvpx/vpx_dsp/bitreader_buffer.h index 8a48a95ed..5e8e53878 100644 --- a/thirdparty/libvpx/vpx_dsp/bitreader_buffer.h +++ b/thirdparty/libvpx/vpx_dsp/bitreader_buffer.h @@ -1,3 +1,5 @@ +#ifndef VPX_DSP_BITREADER_BUFFER_H_ +#define VPX_DSP_BITREADER_BUFFER_H_ /* * Copyright (c) 2013 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_DSP_BITREADER_BUFFER_H_ -#define VPX_DSP_BITREADER_BUFFER_H_ + + #include diff --git a/thirdparty/libvpx/vpx_dsp/inv_txfm.h b/thirdparty/libvpx/vpx_dsp/inv_txfm.h index 9cfe1be3a..94a02eb21 100644 --- a/thirdparty/libvpx/vpx_dsp/inv_txfm.h +++ b/thirdparty/libvpx/vpx_dsp/inv_txfm.h @@ -1,3 +1,5 @@ +#ifndef VPX_DSP_INV_TXFM_H_ +#define VPX_DSP_INV_TXFM_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_DSP_INV_TXFM_H_ -#define VPX_DSP_INV_TXFM_H_ + + #include diff --git a/thirdparty/libvpx/vpx_dsp/prob.h b/thirdparty/libvpx/vpx_dsp/prob.h index c3cb103ff..77cb0f8fa 100644 --- a/thirdparty/libvpx/vpx_dsp/prob.h +++ b/thirdparty/libvpx/vpx_dsp/prob.h @@ -1,3 +1,5 @@ +#ifndef VPX_DSP_PROB_H_ +#define VPX_DSP_PROB_H_ /* * Copyright (c) 2013 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_DSP_PROB_H_ -#define VPX_DSP_PROB_H_ + + #include "./vpx_config.h" #include "./vpx_dsp_common.h" diff --git a/thirdparty/libvpx/vpx_dsp/txfm_common.h b/thirdparty/libvpx/vpx_dsp/txfm_common.h index 442e6a57b..e8171bae2 100644 --- a/thirdparty/libvpx/vpx_dsp/txfm_common.h +++ b/thirdparty/libvpx/vpx_dsp/txfm_common.h @@ -1,3 +1,5 @@ +#ifndef VPX_DSP_TXFM_COMMON_H_ +#define VPX_DSP_TXFM_COMMON_H_ /* * Copyright (c) 2015 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_DSP_TXFM_COMMON_H_ -#define VPX_DSP_TXFM_COMMON_H_ + + #include "vpx_dsp/vpx_dsp_common.h" diff --git a/thirdparty/libvpx/vpx_dsp/vpx_convolve.h b/thirdparty/libvpx/vpx_dsp/vpx_convolve.h index 9ed3f1750..9e9200dad 100644 --- a/thirdparty/libvpx/vpx_dsp/vpx_convolve.h +++ b/thirdparty/libvpx/vpx_dsp/vpx_convolve.h @@ -1,3 +1,5 @@ +#ifndef VPX_DSP_VPX_CONVOLVE_H_ +#define VPX_DSP_VPX_CONVOLVE_H_ /* * Copyright (c) 2013 The WebM project authors. All Rights Reserved. * @@ -7,8 +9,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_DSP_VPX_CONVOLVE_H_ -#define VPX_DSP_VPX_CONVOLVE_H_ + + #include "./vpx_config.h" #include "vpx/vpx_integer.h" diff --git a/thirdparty/libvpx/vpx_dsp/vpx_dsp_common.h b/thirdparty/libvpx/vpx_dsp/vpx_dsp_common.h index a1d0a51ef..548266a05 100644 --- a/thirdparty/libvpx/vpx_dsp/vpx_dsp_common.h +++ b/thirdparty/libvpx/vpx_dsp/vpx_dsp_common.h @@ -1,3 +1,5 @@ +#ifndef VPX_DSP_VPX_DSP_COMMON_H_ +#define VPX_DSP_VPX_DSP_COMMON_H_ /* * Copyright (c) 2015 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_DSP_VPX_DSP_COMMON_H_ -#define VPX_DSP_VPX_DSP_COMMON_H_ + + #include "./vpx_config.h" #include "vpx/vpx_integer.h" diff --git a/thirdparty/libvpx/vpx_dsp/vpx_filter.h b/thirdparty/libvpx/vpx_dsp/vpx_filter.h index 2617febf3..6237fe284 100644 --- a/thirdparty/libvpx/vpx_dsp/vpx_filter.h +++ b/thirdparty/libvpx/vpx_dsp/vpx_filter.h @@ -1,3 +1,5 @@ +#ifndef VPX_DSP_VPX_FILTER_H_ +#define VPX_DSP_VPX_FILTER_H_ /* * Copyright (c) 2015 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_DSP_VPX_FILTER_H_ -#define VPX_DSP_VPX_FILTER_H_ + + #include "vpx/vpx_integer.h" diff --git a/thirdparty/libvpx/vpx_dsp/x86/convolve.h b/thirdparty/libvpx/vpx_dsp/x86/convolve.h index 7e43eb7c7..9a4f36e3e 100644 --- a/thirdparty/libvpx/vpx_dsp/x86/convolve.h +++ b/thirdparty/libvpx/vpx_dsp/x86/convolve.h @@ -1,3 +1,5 @@ +#ifndef VPX_DSP_X86_CONVOLVE_H_ +#define VPX_DSP_X86_CONVOLVE_H_ /* * Copyright (c) 2015 The WebM project authors. All Rights Reserved. * @@ -7,8 +9,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_DSP_X86_CONVOLVE_H_ -#define VPX_DSP_X86_CONVOLVE_H_ + + #include diff --git a/thirdparty/libvpx/vpx_dsp/x86/inv_txfm_sse2.h b/thirdparty/libvpx/vpx_dsp/x86/inv_txfm_sse2.h index bd520c18e..ac8d1c54a 100644 --- a/thirdparty/libvpx/vpx_dsp/x86/inv_txfm_sse2.h +++ b/thirdparty/libvpx/vpx_dsp/x86/inv_txfm_sse2.h @@ -1,3 +1,5 @@ +#ifndef VPX_DSP_X86_INV_TXFM_SSE2_H_ +#define VPX_DSP_X86_INV_TXFM_SSE2_H_ /* * Copyright (c) 2015 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_DSP_X86_INV_TXFM_SSE2_H_ -#define VPX_DSP_X86_INV_TXFM_SSE2_H_ + + #include // SSE2 #include "./vpx_config.h" diff --git a/thirdparty/libvpx/vpx_dsp/x86/txfm_common_sse2.h b/thirdparty/libvpx/vpx_dsp/x86/txfm_common_sse2.h index 536b20687..7b6273b70 100644 --- a/thirdparty/libvpx/vpx_dsp/x86/txfm_common_sse2.h +++ b/thirdparty/libvpx/vpx_dsp/x86/txfm_common_sse2.h @@ -1,3 +1,5 @@ +#ifndef VPX_DSP_X86_TXFM_COMMON_SSE2_H_ +#define VPX_DSP_X86_TXFM_COMMON_SSE2_H_ /* * Copyright (c) 2015 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_DSP_X86_TXFM_COMMON_SSE2_H_ -#define VPX_DSP_X86_TXFM_COMMON_SSE2_H_ + + #include #include "vpx/vpx_integer.h" diff --git a/thirdparty/libvpx/vpx_mem/include/vpx_mem_intrnl.h b/thirdparty/libvpx/vpx_mem/include/vpx_mem_intrnl.h index c4dd78550..48d3c1403 100644 --- a/thirdparty/libvpx/vpx_mem/include/vpx_mem_intrnl.h +++ b/thirdparty/libvpx/vpx_mem/include/vpx_mem_intrnl.h @@ -1,3 +1,5 @@ +#ifndef VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_ +#define VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_ -#define VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_ + + #include "./vpx_config.h" #define ADDRESS_STORAGE_SIZE sizeof(size_t) diff --git a/thirdparty/libvpx/vpx_mem/vpx_mem.h b/thirdparty/libvpx/vpx_mem/vpx_mem.h index a006e0f00..ce32ac296 100644 --- a/thirdparty/libvpx/vpx_mem/vpx_mem.h +++ b/thirdparty/libvpx/vpx_mem/vpx_mem.h @@ -1,3 +1,5 @@ +#ifndef VPX_MEM_VPX_MEM_H_ +#define VPX_MEM_VPX_MEM_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VPX_MEM_VPX_MEM_H_ -#define VPX_MEM_VPX_MEM_H_ + + #include "vpx_config.h" #if defined(__uClinux__) diff --git a/thirdparty/libvpx/vpx_ports/arm.h b/thirdparty/libvpx/vpx_ports/arm.h index 42c98f5a8..56bd89d53 100644 --- a/thirdparty/libvpx/vpx_ports/arm.h +++ b/thirdparty/libvpx/vpx_ports/arm.h @@ -1,3 +1,5 @@ +#ifndef VPX_PORTS_ARM_H_ +#define VPX_PORTS_ARM_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VPX_PORTS_ARM_H_ -#define VPX_PORTS_ARM_H_ + + #include #include "vpx_config.h" diff --git a/thirdparty/libvpx/vpx_ports/bitops.h b/thirdparty/libvpx/vpx_ports/bitops.h index 84ff3659f..4622ccb73 100644 --- a/thirdparty/libvpx/vpx_ports/bitops.h +++ b/thirdparty/libvpx/vpx_ports/bitops.h @@ -1,3 +1,5 @@ +#ifndef VPX_PORTS_BITOPS_H_ +#define VPX_PORTS_BITOPS_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_PORTS_BITOPS_H_ -#define VPX_PORTS_BITOPS_H_ + + #include diff --git a/thirdparty/libvpx/vpx_ports/config.h b/thirdparty/libvpx/vpx_ports/config.h index 3c1ab99f4..9c3191311 100644 --- a/thirdparty/libvpx/vpx_ports/config.h +++ b/thirdparty/libvpx/vpx_ports/config.h @@ -1,3 +1,5 @@ +#ifndef VPX_PORTS_CONFIG_H_ +#define VPX_PORTS_CONFIG_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_PORTS_CONFIG_H_ -#define VPX_PORTS_CONFIG_H_ + + #include "vpx_config.h" diff --git a/thirdparty/libvpx/vpx_ports/emmintrin_compat.h b/thirdparty/libvpx/vpx_ports/emmintrin_compat.h index 16176383d..40b25873d 100644 --- a/thirdparty/libvpx/vpx_ports/emmintrin_compat.h +++ b/thirdparty/libvpx/vpx_ports/emmintrin_compat.h @@ -1,3 +1,5 @@ +#ifndef VPX_PORTS_EMMINTRIN_COMPAT_H_ +#define VPX_PORTS_EMMINTRIN_COMPAT_H_ /* * Copyright (c) 2012 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_PORTS_EMMINTRIN_COMPAT_H_ -#define VPX_PORTS_EMMINTRIN_COMPAT_H_ + + #if defined(__GNUC__) && __GNUC__ < 4 /* From emmintrin.h (gcc 4.5.3) */ diff --git a/thirdparty/libvpx/vpx_ports/mem.h b/thirdparty/libvpx/vpx_ports/mem.h index 7502f9063..a8e1d8df1 100644 --- a/thirdparty/libvpx/vpx_ports/mem.h +++ b/thirdparty/libvpx/vpx_ports/mem.h @@ -1,3 +1,5 @@ +#ifndef VPX_PORTS_MEM_H_ +#define VPX_PORTS_MEM_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VPX_PORTS_MEM_H_ -#define VPX_PORTS_MEM_H_ + + #include "vpx_config.h" #include "vpx/vpx_integer.h" diff --git a/thirdparty/libvpx/vpx_ports/mem_ops.h b/thirdparty/libvpx/vpx_ports/mem_ops.h index 620df31b2..f96d6a59e 100644 --- a/thirdparty/libvpx/vpx_ports/mem_ops.h +++ b/thirdparty/libvpx/vpx_ports/mem_ops.h @@ -1,3 +1,5 @@ +#ifndef VPX_PORTS_MEM_OPS_H_ +#define VPX_PORTS_MEM_OPS_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_PORTS_MEM_OPS_H_ -#define VPX_PORTS_MEM_OPS_H_ + + /* \file * \brief Provides portable memory access primitives diff --git a/thirdparty/libvpx/vpx_ports/mem_ops_aligned.h b/thirdparty/libvpx/vpx_ports/mem_ops_aligned.h index 46f61738b..1b70c15d8 100644 --- a/thirdparty/libvpx/vpx_ports/mem_ops_aligned.h +++ b/thirdparty/libvpx/vpx_ports/mem_ops_aligned.h @@ -1,3 +1,5 @@ +#ifndef VPX_PORTS_MEM_OPS_ALIGNED_H_ +#define VPX_PORTS_MEM_OPS_ALIGNED_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_PORTS_MEM_OPS_ALIGNED_H_ -#define VPX_PORTS_MEM_OPS_ALIGNED_H_ + + #include "vpx/vpx_integer.h" diff --git a/thirdparty/libvpx/vpx_ports/msvc.h b/thirdparty/libvpx/vpx_ports/msvc.h index cab77405f..669a2c483 100644 --- a/thirdparty/libvpx/vpx_ports/msvc.h +++ b/thirdparty/libvpx/vpx_ports/msvc.h @@ -1,3 +1,5 @@ +#ifndef VPX_PORTS_MSVC_H_ +#define VPX_PORTS_MSVC_H_ /* * Copyright (c) 2015 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_PORTS_MSVC_H_ -#define VPX_PORTS_MSVC_H_ + + #ifdef _MSC_VER #include "./vpx_config.h" diff --git a/thirdparty/libvpx/vpx_ports/system_state.h b/thirdparty/libvpx/vpx_ports/system_state.h index 01989dcaf..56e555089 100644 --- a/thirdparty/libvpx/vpx_ports/system_state.h +++ b/thirdparty/libvpx/vpx_ports/system_state.h @@ -1,3 +1,5 @@ +#ifndef VPX_PORTS_SYSTEM_STATE_H_ +#define VPX_PORTS_SYSTEM_STATE_H_ /* * Copyright (c) 2015 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_PORTS_SYSTEM_STATE_H_ -#define VPX_PORTS_SYSTEM_STATE_H_ + + #include "./vpx_config.h" diff --git a/thirdparty/libvpx/vpx_ports/vpx_once.h b/thirdparty/libvpx/vpx_ports/vpx_once.h index da04db459..b174b50a4 100644 --- a/thirdparty/libvpx/vpx_ports/vpx_once.h +++ b/thirdparty/libvpx/vpx_ports/vpx_once.h @@ -1,3 +1,5 @@ +#ifndef VPX_PORTS_VPX_ONCE_H_ +#define VPX_PORTS_VPX_ONCE_H_ /* * Copyright (c) 2015 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_PORTS_VPX_ONCE_H_ -#define VPX_PORTS_VPX_ONCE_H_ + + #include "vpx_config.h" diff --git a/thirdparty/libvpx/vpx_ports/vpx_timer.h b/thirdparty/libvpx/vpx_ports/vpx_timer.h index dd98e291c..627c1ff63 100644 --- a/thirdparty/libvpx/vpx_ports/vpx_timer.h +++ b/thirdparty/libvpx/vpx_ports/vpx_timer.h @@ -1,3 +1,5 @@ +#ifndef VPX_PORTS_VPX_TIMER_H_ +#define VPX_PORTS_VPX_TIMER_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VPX_PORTS_VPX_TIMER_H_ -#define VPX_PORTS_VPX_TIMER_H_ + + #include "./vpx_config.h" diff --git a/thirdparty/libvpx/vpx_ports/x86.h b/thirdparty/libvpx/vpx_ports/x86.h index bae25ac34..dd43187b6 100644 --- a/thirdparty/libvpx/vpx_ports/x86.h +++ b/thirdparty/libvpx/vpx_ports/x86.h @@ -1,3 +1,5 @@ +#ifndef VPX_PORTS_X86_H_ +#define VPX_PORTS_X86_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VPX_PORTS_X86_H_ -#define VPX_PORTS_X86_H_ + + #include #if defined(_MSC_VER) diff --git a/thirdparty/libvpx/vpx_scale/vpx_scale.h b/thirdparty/libvpx/vpx_scale/vpx_scale.h index 43fcf9d66..6b9c59cb3 100644 --- a/thirdparty/libvpx/vpx_scale/vpx_scale.h +++ b/thirdparty/libvpx/vpx_scale/vpx_scale.h @@ -1,3 +1,5 @@ +#ifndef VPX_SCALE_VPX_SCALE_H_ +#define VPX_SCALE_VPX_SCALE_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -9,8 +11,8 @@ */ -#ifndef VPX_SCALE_VPX_SCALE_H_ -#define VPX_SCALE_VPX_SCALE_H_ + + #include "vpx_scale/yv12config.h" diff --git a/thirdparty/libvpx/vpx_scale/yv12config.h b/thirdparty/libvpx/vpx_scale/yv12config.h index 37b255d4d..fe16d6a1d 100644 --- a/thirdparty/libvpx/vpx_scale/yv12config.h +++ b/thirdparty/libvpx/vpx_scale/yv12config.h @@ -1,3 +1,5 @@ +#ifndef VPX_SCALE_YV12CONFIG_H_ +#define VPX_SCALE_YV12CONFIG_H_ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * @@ -8,8 +10,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VPX_SCALE_YV12CONFIG_H_ -#define VPX_SCALE_YV12CONFIG_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libvpx/vpx_util/endian_inl.h b/thirdparty/libvpx/vpx_util/endian_inl.h index 37bdce1cc..25f559769 100644 --- a/thirdparty/libvpx/vpx_util/endian_inl.h +++ b/thirdparty/libvpx/vpx_util/endian_inl.h @@ -1,3 +1,5 @@ +#ifndef VPX_UTIL_ENDIAN_INL_H_ +#define VPX_UTIL_ENDIAN_INL_H_ // Copyright 2014 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -9,8 +11,8 @@ // // Endian related functions. -#ifndef VPX_UTIL_ENDIAN_INL_H_ -#define VPX_UTIL_ENDIAN_INL_H_ + + #include #include "./vpx_config.h" diff --git a/thirdparty/libvpx/vpx_util/vpx_thread.h b/thirdparty/libvpx/vpx_util/vpx_thread.h index 2062abd75..b48c762ae 100644 --- a/thirdparty/libvpx/vpx_util/vpx_thread.h +++ b/thirdparty/libvpx/vpx_util/vpx_thread.h @@ -1,3 +1,5 @@ +#ifndef VPX_THREAD_H_ +#define VPX_THREAD_H_ // Copyright 2013 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -13,8 +15,8 @@ // http://git.chromium.org/webm/libwebp.git // 100644 blob 7bd451b124ae3b81596abfbcc823e3cb129d3a38 src/utils/thread.h -#ifndef VPX_THREAD_H_ -#define VPX_THREAD_H_ + + #include "./vpx_config.h" diff --git a/thirdparty/libwebp/src/dec/alphai_dec.h b/thirdparty/libwebp/src/dec/alphai_dec.h index a64104abe..95728661e 100644 --- a/thirdparty/libwebp/src/dec/alphai_dec.h +++ b/thirdparty/libwebp/src/dec/alphai_dec.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DEC_ALPHAI_DEC_H_ +#define WEBP_DEC_ALPHAI_DEC_H_ // Copyright 2013 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Urvang (urvang@google.com) -#ifndef WEBP_DEC_ALPHAI_DEC_H_ -#define WEBP_DEC_ALPHAI_DEC_H_ + + #include "src/dec/webpi_dec.h" #include "src/utils/filters_utils.h" diff --git a/thirdparty/libwebp/src/dec/common_dec.h b/thirdparty/libwebp/src/dec/common_dec.h index b158550a8..587bb315b 100644 --- a/thirdparty/libwebp/src/dec/common_dec.h +++ b/thirdparty/libwebp/src/dec/common_dec.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DEC_COMMON_DEC_H_ +#define WEBP_DEC_COMMON_DEC_H_ // Copyright 2015 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_DEC_COMMON_DEC_H_ -#define WEBP_DEC_COMMON_DEC_H_ + + // intra prediction modes enum { B_DC_PRED = 0, // 4x4 modes diff --git a/thirdparty/libwebp/src/dec/vp8_dec.h b/thirdparty/libwebp/src/dec/vp8_dec.h index a05405df7..83120b0cf 100644 --- a/thirdparty/libwebp/src/dec/vp8_dec.h +++ b/thirdparty/libwebp/src/dec/vp8_dec.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DEC_VP8_DEC_H_ +#define WEBP_DEC_VP8_DEC_H_ // Copyright 2010 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_DEC_VP8_DEC_H_ -#define WEBP_DEC_VP8_DEC_H_ + + #include "src/webp/decode.h" diff --git a/thirdparty/libwebp/src/dec/vp8i_dec.h b/thirdparty/libwebp/src/dec/vp8i_dec.h index 9af22f8cc..6ed2d4f49 100644 --- a/thirdparty/libwebp/src/dec/vp8i_dec.h +++ b/thirdparty/libwebp/src/dec/vp8i_dec.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DEC_VP8I_DEC_H_ +#define WEBP_DEC_VP8I_DEC_H_ // Copyright 2010 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_DEC_VP8I_DEC_H_ -#define WEBP_DEC_VP8I_DEC_H_ + + #include // for memcpy() #include "src/dec/common_dec.h" diff --git a/thirdparty/libwebp/src/dec/vp8li_dec.h b/thirdparty/libwebp/src/dec/vp8li_dec.h index 72b2e8612..21a9b57dc 100644 --- a/thirdparty/libwebp/src/dec/vp8li_dec.h +++ b/thirdparty/libwebp/src/dec/vp8li_dec.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DEC_VP8LI_DEC_H_ +#define WEBP_DEC_VP8LI_DEC_H_ // Copyright 2012 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -12,8 +14,8 @@ // Author: Skal (pascal.massimino@gmail.com) // Vikas Arora(vikaas.arora@gmail.com) -#ifndef WEBP_DEC_VP8LI_DEC_H_ -#define WEBP_DEC_VP8LI_DEC_H_ + + #include // for memcpy() #include "src/dec/webpi_dec.h" diff --git a/thirdparty/libwebp/src/dec/webpi_dec.h b/thirdparty/libwebp/src/dec/webpi_dec.h index 3b97388c7..f1f38fb1f 100644 --- a/thirdparty/libwebp/src/dec/webpi_dec.h +++ b/thirdparty/libwebp/src/dec/webpi_dec.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DEC_WEBPI_DEC_H_ +#define WEBP_DEC_WEBPI_DEC_H_ // Copyright 2011 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: somnath@google.com (Somnath Banerjee) -#ifndef WEBP_DEC_WEBPI_DEC_H_ -#define WEBP_DEC_WEBPI_DEC_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libwebp/src/dsp/common_sse2.h b/thirdparty/libwebp/src/dsp/common_sse2.h index e9f1ebff4..5d5f00e89 100644 --- a/thirdparty/libwebp/src/dsp/common_sse2.h +++ b/thirdparty/libwebp/src/dsp/common_sse2.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DSP_COMMON_SSE2_H_ +#define WEBP_DSP_COMMON_SSE2_H_ // Copyright 2016 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Vincent Rabaud (vrabaud@google.com) -#ifndef WEBP_DSP_COMMON_SSE2_H_ -#define WEBP_DSP_COMMON_SSE2_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libwebp/src/dsp/common_sse41.h b/thirdparty/libwebp/src/dsp/common_sse41.h index 2f173c024..acc9a69df 100644 --- a/thirdparty/libwebp/src/dsp/common_sse41.h +++ b/thirdparty/libwebp/src/dsp/common_sse41.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DSP_COMMON_SSE41_H_ +#define WEBP_DSP_COMMON_SSE41_H_ // Copyright 2016 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Vincent Rabaud (vrabaud@google.com) -#ifndef WEBP_DSP_COMMON_SSE41_H_ -#define WEBP_DSP_COMMON_SSE41_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libwebp/src/dsp/dsp.h b/thirdparty/libwebp/src/dsp/dsp.h index c4f57e4d5..92cbaad85 100644 --- a/thirdparty/libwebp/src/dsp/dsp.h +++ b/thirdparty/libwebp/src/dsp/dsp.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DSP_DSP_H_ +#define WEBP_DSP_DSP_H_ // Copyright 2011 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_DSP_DSP_H_ -#define WEBP_DSP_DSP_H_ + + #ifdef HAVE_CONFIG_H #include "src/webp/config.h" diff --git a/thirdparty/libwebp/src/dsp/lossless.h b/thirdparty/libwebp/src/dsp/lossless.h index c26c6bca0..27bf0b4f1 100644 --- a/thirdparty/libwebp/src/dsp/lossless.h +++ b/thirdparty/libwebp/src/dsp/lossless.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DSP_LOSSLESS_H_ +#define WEBP_DSP_LOSSLESS_H_ // Copyright 2012 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -12,8 +14,8 @@ // Authors: Vikas Arora (vikaas.arora@gmail.com) // Jyrki Alakuijala (jyrki@google.com) -#ifndef WEBP_DSP_LOSSLESS_H_ -#define WEBP_DSP_LOSSLESS_H_ + + #include "src/webp/types.h" #include "src/webp/decode.h" diff --git a/thirdparty/libwebp/src/dsp/lossless_common.h b/thirdparty/libwebp/src/dsp/lossless_common.h index 6a2f736b5..54d7adb40 100644 --- a/thirdparty/libwebp/src/dsp/lossless_common.h +++ b/thirdparty/libwebp/src/dsp/lossless_common.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DSP_LOSSLESS_COMMON_H_ +#define WEBP_DSP_LOSSLESS_COMMON_H_ // Copyright 2012 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -13,8 +15,8 @@ // Jyrki Alakuijala (jyrki@google.com) // Vincent Rabaud (vrabaud@google.com) -#ifndef WEBP_DSP_LOSSLESS_COMMON_H_ -#define WEBP_DSP_LOSSLESS_COMMON_H_ + + #include "src/webp/types.h" diff --git a/thirdparty/libwebp/src/dsp/mips_macro.h b/thirdparty/libwebp/src/dsp/mips_macro.h index 44aba9b71..c11b2cfc2 100644 --- a/thirdparty/libwebp/src/dsp/mips_macro.h +++ b/thirdparty/libwebp/src/dsp/mips_macro.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DSP_MIPS_MACRO_H_ +#define WEBP_DSP_MIPS_MACRO_H_ // Copyright 2014 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -9,8 +11,8 @@ // // MIPS common macros -#ifndef WEBP_DSP_MIPS_MACRO_H_ -#define WEBP_DSP_MIPS_MACRO_H_ + + #if defined(__GNUC__) && defined(__ANDROID__) && LOCAL_GCC_VERSION == 0x409 #define WORK_AROUND_GCC diff --git a/thirdparty/libwebp/src/dsp/msa_macro.h b/thirdparty/libwebp/src/dsp/msa_macro.h index 51f6c643a..60e8a732a 100644 --- a/thirdparty/libwebp/src/dsp/msa_macro.h +++ b/thirdparty/libwebp/src/dsp/msa_macro.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DSP_MSA_MACRO_H_ +#define WEBP_DSP_MSA_MACRO_H_ // Copyright 2016 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author(s): Prashant Patil (prashant.patil@imgtec.com) -#ifndef WEBP_DSP_MSA_MACRO_H_ -#define WEBP_DSP_MSA_MACRO_H_ + + #include "src/dsp/dsp.h" diff --git a/thirdparty/libwebp/src/dsp/neon.h b/thirdparty/libwebp/src/dsp/neon.h index c591f9b9a..4ced8e31d 100644 --- a/thirdparty/libwebp/src/dsp/neon.h +++ b/thirdparty/libwebp/src/dsp/neon.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DSP_NEON_H_ +#define WEBP_DSP_NEON_H_ // Copyright 2014 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -9,8 +11,8 @@ // // NEON common code. -#ifndef WEBP_DSP_NEON_H_ -#define WEBP_DSP_NEON_H_ + + #include "src/dsp/dsp.h" diff --git a/thirdparty/libwebp/src/dsp/quant.h b/thirdparty/libwebp/src/dsp/quant.h index 5e8dba8d1..3ad31d834 100644 --- a/thirdparty/libwebp/src/dsp/quant.h +++ b/thirdparty/libwebp/src/dsp/quant.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DSP_QUANT_H_ +#define WEBP_DSP_QUANT_H_ // Copyright 2018 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -7,8 +9,8 @@ // be found in the AUTHORS file in the root of the source tree. // ----------------------------------------------------------------------------- -#ifndef WEBP_DSP_QUANT_H_ -#define WEBP_DSP_QUANT_H_ + + #include diff --git a/thirdparty/libwebp/src/dsp/yuv.h b/thirdparty/libwebp/src/dsp/yuv.h index 66a397d11..5b6889d95 100644 --- a/thirdparty/libwebp/src/dsp/yuv.h +++ b/thirdparty/libwebp/src/dsp/yuv.h @@ -1,3 +1,5 @@ +#ifndef WEBP_DSP_YUV_H_ +#define WEBP_DSP_YUV_H_ // Copyright 2010 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -32,8 +34,8 @@ // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_DSP_YUV_H_ -#define WEBP_DSP_YUV_H_ + + #include "src/dsp/dsp.h" #include "src/dec/vp8_dec.h" diff --git a/thirdparty/libwebp/src/enc/backward_references_enc.h b/thirdparty/libwebp/src/enc/backward_references_enc.h index 4c0267b41..85b6bf544 100644 --- a/thirdparty/libwebp/src/enc/backward_references_enc.h +++ b/thirdparty/libwebp/src/enc/backward_references_enc.h @@ -1,3 +1,5 @@ +#ifndef WEBP_ENC_BACKWARD_REFERENCES_ENC_H_ +#define WEBP_ENC_BACKWARD_REFERENCES_ENC_H_ // Copyright 2012 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -10,8 +12,8 @@ // Author: Jyrki Alakuijala (jyrki@google.com) // -#ifndef WEBP_ENC_BACKWARD_REFERENCES_ENC_H_ -#define WEBP_ENC_BACKWARD_REFERENCES_ENC_H_ + + #include #include diff --git a/thirdparty/libwebp/src/enc/cost_enc.h b/thirdparty/libwebp/src/enc/cost_enc.h index a4b177b34..f278ddc69 100644 --- a/thirdparty/libwebp/src/enc/cost_enc.h +++ b/thirdparty/libwebp/src/enc/cost_enc.h @@ -1,3 +1,5 @@ +#ifndef WEBP_ENC_COST_ENC_H_ +#define WEBP_ENC_COST_ENC_H_ // Copyright 2011 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_ENC_COST_ENC_H_ -#define WEBP_ENC_COST_ENC_H_ + + #include #include diff --git a/thirdparty/libwebp/src/enc/histogram_enc.h b/thirdparty/libwebp/src/enc/histogram_enc.h index c3428b5d5..c8ee80204 100644 --- a/thirdparty/libwebp/src/enc/histogram_enc.h +++ b/thirdparty/libwebp/src/enc/histogram_enc.h @@ -1,3 +1,5 @@ +#ifndef WEBP_ENC_HISTOGRAM_ENC_H_ +#define WEBP_ENC_HISTOGRAM_ENC_H_ // Copyright 2012 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Models the histograms of literal and distance codes. -#ifndef WEBP_ENC_HISTOGRAM_ENC_H_ -#define WEBP_ENC_HISTOGRAM_ENC_H_ + + #include diff --git a/thirdparty/libwebp/src/enc/vp8i_enc.h b/thirdparty/libwebp/src/enc/vp8i_enc.h index b4bba08f2..5ceb035f4 100644 --- a/thirdparty/libwebp/src/enc/vp8i_enc.h +++ b/thirdparty/libwebp/src/enc/vp8i_enc.h @@ -1,3 +1,5 @@ +#ifndef WEBP_ENC_VP8I_ENC_H_ +#define WEBP_ENC_VP8I_ENC_H_ // Copyright 2011 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_ENC_VP8I_ENC_H_ -#define WEBP_ENC_VP8I_ENC_H_ + + #include // for memcpy() #include "src/dec/common_dec.h" diff --git a/thirdparty/libwebp/src/enc/vp8li_enc.h b/thirdparty/libwebp/src/enc/vp8li_enc.h index 00de48946..8ce8e3570 100644 --- a/thirdparty/libwebp/src/enc/vp8li_enc.h +++ b/thirdparty/libwebp/src/enc/vp8li_enc.h @@ -1,3 +1,5 @@ +#ifndef WEBP_ENC_VP8LI_ENC_H_ +#define WEBP_ENC_VP8LI_ENC_H_ // Copyright 2012 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Vikas Arora (vikaas.arora@gmail.com) -#ifndef WEBP_ENC_VP8LI_ENC_H_ -#define WEBP_ENC_VP8LI_ENC_H_ + + #ifdef HAVE_CONFIG_H #include "src/webp/config.h" diff --git a/thirdparty/libwebp/src/mux/animi.h b/thirdparty/libwebp/src/mux/animi.h index 34c45ba4d..502b1494d 100644 --- a/thirdparty/libwebp/src/mux/animi.h +++ b/thirdparty/libwebp/src/mux/animi.h @@ -1,3 +1,5 @@ +#ifndef WEBP_MUX_ANIMI_H_ +#define WEBP_MUX_ANIMI_H_ // Copyright 2016 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Hui Su (huisu@google.com) -#ifndef WEBP_MUX_ANIMI_H_ -#define WEBP_MUX_ANIMI_H_ + + #include "src/webp/mux.h" diff --git a/thirdparty/libwebp/src/mux/muxi.h b/thirdparty/libwebp/src/mux/muxi.h index d9bf9b377..b9fbfbc76 100644 --- a/thirdparty/libwebp/src/mux/muxi.h +++ b/thirdparty/libwebp/src/mux/muxi.h @@ -1,3 +1,5 @@ +#ifndef WEBP_MUX_MUXI_H_ +#define WEBP_MUX_MUXI_H_ // Copyright 2011 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Urvang (urvang@google.com) -#ifndef WEBP_MUX_MUXI_H_ -#define WEBP_MUX_MUXI_H_ + + #include #include diff --git a/thirdparty/libwebp/src/utils/bit_reader_inl_utils.h b/thirdparty/libwebp/src/utils/bit_reader_inl_utils.h index 404b9a6d8..8f1950ace 100644 --- a/thirdparty/libwebp/src/utils/bit_reader_inl_utils.h +++ b/thirdparty/libwebp/src/utils/bit_reader_inl_utils.h @@ -1,3 +1,5 @@ +#ifndef WEBP_UTILS_BIT_READER_INL_UTILS_H_ +#define WEBP_UTILS_BIT_READER_INL_UTILS_H_ // Copyright 2014 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -13,8 +15,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_UTILS_BIT_READER_INL_UTILS_H_ -#define WEBP_UTILS_BIT_READER_INL_UTILS_H_ + + #ifdef HAVE_CONFIG_H #include "src/webp/config.h" diff --git a/thirdparty/libwebp/src/utils/bit_reader_utils.h b/thirdparty/libwebp/src/utils/bit_reader_utils.h index e64156e31..f5c000ecc 100644 --- a/thirdparty/libwebp/src/utils/bit_reader_utils.h +++ b/thirdparty/libwebp/src/utils/bit_reader_utils.h @@ -1,3 +1,5 @@ +#ifndef WEBP_UTILS_BIT_READER_UTILS_H_ +#define WEBP_UTILS_BIT_READER_UTILS_H_ // Copyright 2010 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -12,8 +14,8 @@ // Author: Skal (pascal.massimino@gmail.com) // Vikas Arora (vikaas.arora@gmail.com) -#ifndef WEBP_UTILS_BIT_READER_UTILS_H_ -#define WEBP_UTILS_BIT_READER_UTILS_H_ + + #include #ifdef _MSC_VER diff --git a/thirdparty/libwebp/src/utils/bit_writer_utils.h b/thirdparty/libwebp/src/utils/bit_writer_utils.h index b9d5102a5..29ad4d6a4 100644 --- a/thirdparty/libwebp/src/utils/bit_writer_utils.h +++ b/thirdparty/libwebp/src/utils/bit_writer_utils.h @@ -1,3 +1,5 @@ +#ifndef WEBP_UTILS_BIT_WRITER_UTILS_H_ +#define WEBP_UTILS_BIT_WRITER_UTILS_H_ // Copyright 2011 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_UTILS_BIT_WRITER_UTILS_H_ -#define WEBP_UTILS_BIT_WRITER_UTILS_H_ + + #include "src/webp/types.h" diff --git a/thirdparty/libwebp/src/utils/color_cache_utils.h b/thirdparty/libwebp/src/utils/color_cache_utils.h index b45d47c2d..c62e761fc 100644 --- a/thirdparty/libwebp/src/utils/color_cache_utils.h +++ b/thirdparty/libwebp/src/utils/color_cache_utils.h @@ -1,3 +1,5 @@ +#ifndef WEBP_UTILS_COLOR_CACHE_UTILS_H_ +#define WEBP_UTILS_COLOR_CACHE_UTILS_H_ // Copyright 2012 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -12,8 +14,8 @@ // Authors: Jyrki Alakuijala (jyrki@google.com) // Urvang Joshi (urvang@google.com) -#ifndef WEBP_UTILS_COLOR_CACHE_UTILS_H_ -#define WEBP_UTILS_COLOR_CACHE_UTILS_H_ + + #include diff --git a/thirdparty/libwebp/src/utils/endian_inl_utils.h b/thirdparty/libwebp/src/utils/endian_inl_utils.h index 3630a293b..386f0a2e6 100644 --- a/thirdparty/libwebp/src/utils/endian_inl_utils.h +++ b/thirdparty/libwebp/src/utils/endian_inl_utils.h @@ -1,3 +1,5 @@ +#ifndef WEBP_UTILS_ENDIAN_INL_UTILS_H_ +#define WEBP_UTILS_ENDIAN_INL_UTILS_H_ // Copyright 2014 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -9,8 +11,8 @@ // // Endian related functions. -#ifndef WEBP_UTILS_ENDIAN_INL_UTILS_H_ -#define WEBP_UTILS_ENDIAN_INL_UTILS_H_ + + #ifdef HAVE_CONFIG_H #include "src/webp/config.h" diff --git a/thirdparty/libwebp/src/utils/filters_utils.h b/thirdparty/libwebp/src/utils/filters_utils.h index 61da66e21..fa66ddf56 100644 --- a/thirdparty/libwebp/src/utils/filters_utils.h +++ b/thirdparty/libwebp/src/utils/filters_utils.h @@ -1,3 +1,5 @@ +#ifndef WEBP_UTILS_FILTERS_UTILS_H_ +#define WEBP_UTILS_FILTERS_UTILS_H_ // Copyright 2011 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Urvang (urvang@google.com) -#ifndef WEBP_UTILS_FILTERS_UTILS_H_ -#define WEBP_UTILS_FILTERS_UTILS_H_ + + #include "src/webp/types.h" #include "src/dsp/dsp.h" diff --git a/thirdparty/libwebp/src/utils/huffman_encode_utils.h b/thirdparty/libwebp/src/utils/huffman_encode_utils.h index 3f7f1d807..d246f1f21 100644 --- a/thirdparty/libwebp/src/utils/huffman_encode_utils.h +++ b/thirdparty/libwebp/src/utils/huffman_encode_utils.h @@ -1,3 +1,5 @@ +#ifndef WEBP_UTILS_HUFFMAN_ENCODE_UTILS_H_ +#define WEBP_UTILS_HUFFMAN_ENCODE_UTILS_H_ // Copyright 2011 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Entropy encoding (Huffman) for webp lossless -#ifndef WEBP_UTILS_HUFFMAN_ENCODE_UTILS_H_ -#define WEBP_UTILS_HUFFMAN_ENCODE_UTILS_H_ + + #include "src/webp/types.h" diff --git a/thirdparty/libwebp/src/utils/huffman_utils.h b/thirdparty/libwebp/src/utils/huffman_utils.h index 13b7ad1ac..f3d187618 100644 --- a/thirdparty/libwebp/src/utils/huffman_utils.h +++ b/thirdparty/libwebp/src/utils/huffman_utils.h @@ -1,3 +1,5 @@ +#ifndef WEBP_UTILS_HUFFMAN_UTILS_H_ +#define WEBP_UTILS_HUFFMAN_UTILS_H_ // Copyright 2012 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Urvang Joshi (urvang@google.com) -#ifndef WEBP_UTILS_HUFFMAN_UTILS_H_ -#define WEBP_UTILS_HUFFMAN_UTILS_H_ + + #include #include "src/webp/format_constants.h" diff --git a/thirdparty/libwebp/src/utils/quant_levels_dec_utils.h b/thirdparty/libwebp/src/utils/quant_levels_dec_utils.h index 327f19f33..6e774137a 100644 --- a/thirdparty/libwebp/src/utils/quant_levels_dec_utils.h +++ b/thirdparty/libwebp/src/utils/quant_levels_dec_utils.h @@ -1,3 +1,5 @@ +#ifndef WEBP_UTILS_QUANT_LEVELS_DEC_UTILS_H_ +#define WEBP_UTILS_QUANT_LEVELS_DEC_UTILS_H_ // Copyright 2013 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Vikas Arora (vikasa@google.com) -#ifndef WEBP_UTILS_QUANT_LEVELS_DEC_UTILS_H_ -#define WEBP_UTILS_QUANT_LEVELS_DEC_UTILS_H_ + + #include "src/webp/types.h" diff --git a/thirdparty/libwebp/src/utils/quant_levels_utils.h b/thirdparty/libwebp/src/utils/quant_levels_utils.h index 9ee3ea007..9f72c7a31 100644 --- a/thirdparty/libwebp/src/utils/quant_levels_utils.h +++ b/thirdparty/libwebp/src/utils/quant_levels_utils.h @@ -1,3 +1,5 @@ +#ifndef WEBP_UTILS_QUANT_LEVELS_UTILS_H_ +#define WEBP_UTILS_QUANT_LEVELS_UTILS_H_ // Copyright 2011 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Vikas Arora (vikasa@google.com) -#ifndef WEBP_UTILS_QUANT_LEVELS_UTILS_H_ -#define WEBP_UTILS_QUANT_LEVELS_UTILS_H_ + + #include diff --git a/thirdparty/libwebp/src/utils/random_utils.h b/thirdparty/libwebp/src/utils/random_utils.h index a5006f84f..d25e9ce27 100644 --- a/thirdparty/libwebp/src/utils/random_utils.h +++ b/thirdparty/libwebp/src/utils/random_utils.h @@ -1,3 +1,5 @@ +#ifndef WEBP_UTILS_RANDOM_UTILS_H_ +#define WEBP_UTILS_RANDOM_UTILS_H_ // Copyright 2013 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_UTILS_RANDOM_UTILS_H_ -#define WEBP_UTILS_RANDOM_UTILS_H_ + + #include #include "src/webp/types.h" diff --git a/thirdparty/libwebp/src/utils/rescaler_utils.h b/thirdparty/libwebp/src/utils/rescaler_utils.h index ef201ef86..c6271f035 100644 --- a/thirdparty/libwebp/src/utils/rescaler_utils.h +++ b/thirdparty/libwebp/src/utils/rescaler_utils.h @@ -1,3 +1,5 @@ +#ifndef WEBP_UTILS_RESCALER_UTILS_H_ +#define WEBP_UTILS_RESCALER_UTILS_H_ // Copyright 2012 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_UTILS_RESCALER_UTILS_H_ -#define WEBP_UTILS_RESCALER_UTILS_H_ + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/libwebp/src/utils/thread_utils.h b/thirdparty/libwebp/src/utils/thread_utils.h index 29ad49f74..e2636b6b9 100644 --- a/thirdparty/libwebp/src/utils/thread_utils.h +++ b/thirdparty/libwebp/src/utils/thread_utils.h @@ -1,3 +1,5 @@ +#ifndef WEBP_UTILS_THREAD_UTILS_H_ +#define WEBP_UTILS_THREAD_UTILS_H_ // Copyright 2011 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_UTILS_THREAD_UTILS_H_ -#define WEBP_UTILS_THREAD_UTILS_H_ + + #ifdef HAVE_CONFIG_H #include "src/webp/config.h" diff --git a/thirdparty/libwebp/src/utils/utils.h b/thirdparty/libwebp/src/utils/utils.h index ef04f108f..c5d45f7da 100644 --- a/thirdparty/libwebp/src/utils/utils.h +++ b/thirdparty/libwebp/src/utils/utils.h @@ -1,3 +1,5 @@ +#ifndef WEBP_UTILS_UTILS_H_ +#define WEBP_UTILS_UTILS_H_ // Copyright 2012 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -12,8 +14,8 @@ // Authors: Skal (pascal.massimino@gmail.com) // Urvang (urvang@google.com) -#ifndef WEBP_UTILS_UTILS_H_ -#define WEBP_UTILS_UTILS_H_ + + #ifdef HAVE_CONFIG_H #include "src/webp/config.h" diff --git a/thirdparty/libwebp/src/webp/decode.h b/thirdparty/libwebp/src/webp/decode.h index d98247509..5a7bda5d2 100644 --- a/thirdparty/libwebp/src/webp/decode.h +++ b/thirdparty/libwebp/src/webp/decode.h @@ -1,3 +1,5 @@ +#ifndef WEBP_WEBP_DECODE_H_ +#define WEBP_WEBP_DECODE_H_ // Copyright 2010 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_WEBP_DECODE_H_ -#define WEBP_WEBP_DECODE_H_ + + #include "./types.h" diff --git a/thirdparty/libwebp/src/webp/demux.h b/thirdparty/libwebp/src/webp/demux.h index 846eeb15a..8eaa649bb 100644 --- a/thirdparty/libwebp/src/webp/demux.h +++ b/thirdparty/libwebp/src/webp/demux.h @@ -1,3 +1,5 @@ +#ifndef WEBP_WEBP_DEMUX_H_ +#define WEBP_WEBP_DEMUX_H_ // Copyright 2012 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -45,8 +47,8 @@ WebPDemuxDelete(demux); */ -#ifndef WEBP_WEBP_DEMUX_H_ -#define WEBP_WEBP_DEMUX_H_ + + #include "./decode.h" // for WEBP_CSP_MODE #include "./mux_types.h" diff --git a/thirdparty/libwebp/src/webp/encode.h b/thirdparty/libwebp/src/webp/encode.h index b4c599df8..72767e635 100644 --- a/thirdparty/libwebp/src/webp/encode.h +++ b/thirdparty/libwebp/src/webp/encode.h @@ -1,3 +1,5 @@ +#ifndef WEBP_WEBP_ENCODE_H_ +#define WEBP_WEBP_ENCODE_H_ // Copyright 2011 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_WEBP_ENCODE_H_ -#define WEBP_WEBP_ENCODE_H_ + + #include "./types.h" diff --git a/thirdparty/libwebp/src/webp/format_constants.h b/thirdparty/libwebp/src/webp/format_constants.h index eca6981a4..fcc3b8964 100644 --- a/thirdparty/libwebp/src/webp/format_constants.h +++ b/thirdparty/libwebp/src/webp/format_constants.h @@ -1,3 +1,5 @@ +#ifndef WEBP_WEBP_FORMAT_CONSTANTS_H_ +#define WEBP_WEBP_FORMAT_CONSTANTS_H_ // Copyright 2012 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Urvang (urvang@google.com) -#ifndef WEBP_WEBP_FORMAT_CONSTANTS_H_ -#define WEBP_WEBP_FORMAT_CONSTANTS_H_ + + // Create fourcc of the chunk from the chunk tag characters. #define MKFOURCC(a, b, c, d) ((a) | (b) << 8 | (c) << 16 | (uint32_t)(d) << 24) diff --git a/thirdparty/libwebp/src/webp/mux.h b/thirdparty/libwebp/src/webp/mux.h index 7d27489a4..b1dd2c3d4 100644 --- a/thirdparty/libwebp/src/webp/mux.h +++ b/thirdparty/libwebp/src/webp/mux.h @@ -1,3 +1,5 @@ +#ifndef WEBP_WEBP_MUX_H_ +#define WEBP_WEBP_MUX_H_ // Copyright 2011 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -12,8 +14,8 @@ // Authors: Urvang (urvang@google.com) // Vikas (vikasa@google.com) -#ifndef WEBP_WEBP_MUX_H_ -#define WEBP_WEBP_MUX_H_ + + #include "./mux_types.h" diff --git a/thirdparty/libwebp/src/webp/mux_types.h b/thirdparty/libwebp/src/webp/mux_types.h index 2fe819583..3ab6149d0 100644 --- a/thirdparty/libwebp/src/webp/mux_types.h +++ b/thirdparty/libwebp/src/webp/mux_types.h @@ -1,3 +1,5 @@ +#ifndef WEBP_WEBP_MUX_TYPES_H_ +#define WEBP_WEBP_MUX_TYPES_H_ // Copyright 2012 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Urvang (urvang@google.com) -#ifndef WEBP_WEBP_MUX_TYPES_H_ -#define WEBP_WEBP_MUX_TYPES_H_ + + #include // memset() #include "./types.h" diff --git a/thirdparty/libwebp/src/webp/types.h b/thirdparty/libwebp/src/webp/types.h index 47f7f2b00..8ef817f06 100644 --- a/thirdparty/libwebp/src/webp/types.h +++ b/thirdparty/libwebp/src/webp/types.h @@ -1,3 +1,5 @@ +#ifndef WEBP_WEBP_TYPES_H_ +#define WEBP_WEBP_TYPES_H_ // Copyright 2010 Google Inc. All Rights Reserved. // // Use of this source code is governed by a BSD-style license @@ -11,8 +13,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_WEBP_TYPES_H_ -#define WEBP_WEBP_TYPES_H_ + + #include // for size_t diff --git a/thirdparty/mbedtls/include/mbedtls/aes.h b/thirdparty/mbedtls/include/mbedtls/aes.h index e280dbb1c..e9867eb2c 100644 --- a/thirdparty/mbedtls/include/mbedtls/aes.h +++ b/thirdparty/mbedtls/include/mbedtls/aes.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_AES_H +#define MBEDTLS_AES_H /** * \file aes.h * @@ -37,8 +39,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_AES_H -#define MBEDTLS_AES_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/aesni.h b/thirdparty/mbedtls/include/mbedtls/aesni.h index c1d22f59a..5ee703da7 100644 --- a/thirdparty/mbedtls/include/mbedtls/aesni.h +++ b/thirdparty/mbedtls/include/mbedtls/aesni.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_AESNI_H +#define MBEDTLS_AESNI_H /** * \file aesni.h * @@ -22,8 +24,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_AESNI_H -#define MBEDTLS_AESNI_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/arc4.h b/thirdparty/mbedtls/include/mbedtls/arc4.h index f4b0f9f35..ea6b94c71 100644 --- a/thirdparty/mbedtls/include/mbedtls/arc4.h +++ b/thirdparty/mbedtls/include/mbedtls/arc4.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_ARC4_H +#define MBEDTLS_ARC4_H /** * \file arc4.h * @@ -23,8 +25,8 @@ * limitations under the License. * */ -#ifndef MBEDTLS_ARC4_H -#define MBEDTLS_ARC4_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/aria.h b/thirdparty/mbedtls/include/mbedtls/aria.h index 226e2dbf3..f881e67c2 100644 --- a/thirdparty/mbedtls/include/mbedtls/aria.h +++ b/thirdparty/mbedtls/include/mbedtls/aria.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_ARIA_H +#define MBEDTLS_ARIA_H /** * \file aria.h * @@ -26,8 +28,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_ARIA_H -#define MBEDTLS_ARIA_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/asn1.h b/thirdparty/mbedtls/include/mbedtls/asn1.h index 10f7905b7..58be11f62 100644 --- a/thirdparty/mbedtls/include/mbedtls/asn1.h +++ b/thirdparty/mbedtls/include/mbedtls/asn1.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_ASN1_H +#define MBEDTLS_ASN1_H /** * \file asn1.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_ASN1_H -#define MBEDTLS_ASN1_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/asn1write.h b/thirdparty/mbedtls/include/mbedtls/asn1write.h index 44afae0e5..49e847a87 100644 --- a/thirdparty/mbedtls/include/mbedtls/asn1write.h +++ b/thirdparty/mbedtls/include/mbedtls/asn1write.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_ASN1_WRITE_H +#define MBEDTLS_ASN1_WRITE_H /** * \file asn1write.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_ASN1_WRITE_H -#define MBEDTLS_ASN1_WRITE_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/base64.h b/thirdparty/mbedtls/include/mbedtls/base64.h index cf4149e73..2fb1e31ee 100644 --- a/thirdparty/mbedtls/include/mbedtls/base64.h +++ b/thirdparty/mbedtls/include/mbedtls/base64.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_BASE64_H +#define MBEDTLS_BASE64_H /** * \file base64.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_BASE64_H -#define MBEDTLS_BASE64_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/bignum.h b/thirdparty/mbedtls/include/mbedtls/bignum.h index 9d2cff327..7f9b07d60 100644 --- a/thirdparty/mbedtls/include/mbedtls/bignum.h +++ b/thirdparty/mbedtls/include/mbedtls/bignum.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_BIGNUM_H +#define MBEDTLS_BIGNUM_H /** * \file bignum.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_BIGNUM_H -#define MBEDTLS_BIGNUM_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/blowfish.h b/thirdparty/mbedtls/include/mbedtls/blowfish.h index 77dca70d3..e033dcd3d 100644 --- a/thirdparty/mbedtls/include/mbedtls/blowfish.h +++ b/thirdparty/mbedtls/include/mbedtls/blowfish.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_BLOWFISH_H +#define MBEDTLS_BLOWFISH_H /** * \file blowfish.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_BLOWFISH_H -#define MBEDTLS_BLOWFISH_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/bn_mul.h b/thirdparty/mbedtls/include/mbedtls/bn_mul.h index 31137cd4c..40e6e2fd7 100644 --- a/thirdparty/mbedtls/include/mbedtls/bn_mul.h +++ b/thirdparty/mbedtls/include/mbedtls/bn_mul.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_BN_MUL_H +#define MBEDTLS_BN_MUL_H /** * \file bn_mul.h * @@ -33,8 +35,8 @@ * . Alpha . MIPS32 * . C, longlong . C, generic */ -#ifndef MBEDTLS_BN_MUL_H -#define MBEDTLS_BN_MUL_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/camellia.h b/thirdparty/mbedtls/include/mbedtls/camellia.h index 925a623e4..8296ffbe8 100644 --- a/thirdparty/mbedtls/include/mbedtls/camellia.h +++ b/thirdparty/mbedtls/include/mbedtls/camellia.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CAMELLIA_H +#define MBEDTLS_CAMELLIA_H /** * \file camellia.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_CAMELLIA_H -#define MBEDTLS_CAMELLIA_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/ccm.h b/thirdparty/mbedtls/include/mbedtls/ccm.h index ece5a901c..e416a85e0 100644 --- a/thirdparty/mbedtls/include/mbedtls/ccm.h +++ b/thirdparty/mbedtls/include/mbedtls/ccm.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CCM_H +#define MBEDTLS_CCM_H /** * \file ccm.h * @@ -44,8 +46,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_CCM_H -#define MBEDTLS_CCM_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/certs.h b/thirdparty/mbedtls/include/mbedtls/certs.h index c93c741c7..ca9d6eb41 100644 --- a/thirdparty/mbedtls/include/mbedtls/certs.h +++ b/thirdparty/mbedtls/include/mbedtls/certs.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CERTS_H +#define MBEDTLS_CERTS_H /** * \file certs.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_CERTS_H -#define MBEDTLS_CERTS_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/chacha20.h b/thirdparty/mbedtls/include/mbedtls/chacha20.h index 03b487147..d6074550d 100644 --- a/thirdparty/mbedtls/include/mbedtls/chacha20.h +++ b/thirdparty/mbedtls/include/mbedtls/chacha20.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CHACHA20_H +#define MBEDTLS_CHACHA20_H /** * \file chacha20.h * @@ -29,8 +31,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_CHACHA20_H -#define MBEDTLS_CHACHA20_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/chachapoly.h b/thirdparty/mbedtls/include/mbedtls/chachapoly.h index c4ec7b5f2..4945ab205 100644 --- a/thirdparty/mbedtls/include/mbedtls/chachapoly.h +++ b/thirdparty/mbedtls/include/mbedtls/chachapoly.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CHACHAPOLY_H +#define MBEDTLS_CHACHAPOLY_H /** * \file chachapoly.h * @@ -29,8 +31,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_CHACHAPOLY_H -#define MBEDTLS_CHACHAPOLY_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/check_config.h b/thirdparty/mbedtls/include/mbedtls/check_config.h index 396fe7dfc..3dddcd28a 100644 --- a/thirdparty/mbedtls/include/mbedtls/check_config.h +++ b/thirdparty/mbedtls/include/mbedtls/check_config.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CHECK_CONFIG_H +#define MBEDTLS_CHECK_CONFIG_H /** * \file check_config.h * @@ -25,8 +27,8 @@ * in order to catch dependency issues early. */ -#ifndef MBEDTLS_CHECK_CONFIG_H -#define MBEDTLS_CHECK_CONFIG_H + + /* * We assume CHAR_BIT is 8 in many places. In practice, this is true on our diff --git a/thirdparty/mbedtls/include/mbedtls/cipher.h b/thirdparty/mbedtls/include/mbedtls/cipher.h index 6d83da882..720db72d6 100644 --- a/thirdparty/mbedtls/include/mbedtls/cipher.h +++ b/thirdparty/mbedtls/include/mbedtls/cipher.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CIPHER_H +#define MBEDTLS_CIPHER_H /** * \file cipher.h * @@ -24,8 +26,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_CIPHER_H -#define MBEDTLS_CIPHER_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/cipher_internal.h b/thirdparty/mbedtls/include/mbedtls/cipher_internal.h index 2484c01c7..f5014cec4 100644 --- a/thirdparty/mbedtls/include/mbedtls/cipher_internal.h +++ b/thirdparty/mbedtls/include/mbedtls/cipher_internal.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CIPHER_WRAP_H +#define MBEDTLS_CIPHER_WRAP_H /** * \file cipher_internal.h * @@ -21,8 +23,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_CIPHER_WRAP_H -#define MBEDTLS_CIPHER_WRAP_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/cmac.h b/thirdparty/mbedtls/include/mbedtls/cmac.h index 8934886af..406b1a467 100644 --- a/thirdparty/mbedtls/include/mbedtls/cmac.h +++ b/thirdparty/mbedtls/include/mbedtls/cmac.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CMAC_H +#define MBEDTLS_CMAC_H /** * \file cmac.h * @@ -23,8 +25,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_CMAC_H -#define MBEDTLS_CMAC_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/compat-1.3.h b/thirdparty/mbedtls/include/mbedtls/compat-1.3.h index 40177512c..b0d844aec 100644 --- a/thirdparty/mbedtls/include/mbedtls/compat-1.3.h +++ b/thirdparty/mbedtls/include/mbedtls/compat-1.3.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_COMPAT13_H +#define MBEDTLS_COMPAT13_H /** * \file compat-1.3.h * @@ -35,8 +37,8 @@ #warning "Including compat-1.3.h is deprecated" #endif -#ifndef MBEDTLS_COMPAT13_H -#define MBEDTLS_COMPAT13_H + + /* * config.h options diff --git a/thirdparty/mbedtls/include/mbedtls/config.h b/thirdparty/mbedtls/include/mbedtls/config.h index 87b4e9192..8faebd54e 100644 --- a/thirdparty/mbedtls/include/mbedtls/config.h +++ b/thirdparty/mbedtls/include/mbedtls/config.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CONFIG_H +#define MBEDTLS_CONFIG_H /** * \file config.h * @@ -24,8 +26,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_CONFIG_H -#define MBEDTLS_CONFIG_H + + #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) #define _CRT_SECURE_NO_DEPRECATE 1 diff --git a/thirdparty/mbedtls/include/mbedtls/constant_time.h b/thirdparty/mbedtls/include/mbedtls/constant_time.h index c5de57a01..cc6ffe42e 100644 --- a/thirdparty/mbedtls/include/mbedtls/constant_time.h +++ b/thirdparty/mbedtls/include/mbedtls/constant_time.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CONSTANT_TIME_H +#define MBEDTLS_CONSTANT_TIME_H /** * Constant-time functions * @@ -17,8 +19,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_CONSTANT_TIME_H -#define MBEDTLS_CONSTANT_TIME_H + + #include diff --git a/thirdparty/mbedtls/include/mbedtls/ctr_drbg.h b/thirdparty/mbedtls/include/mbedtls/ctr_drbg.h index dc4adc896..0cb2557b8 100644 --- a/thirdparty/mbedtls/include/mbedtls/ctr_drbg.h +++ b/thirdparty/mbedtls/include/mbedtls/ctr_drbg.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CTR_DRBG_H +#define MBEDTLS_CTR_DRBG_H /** * \file ctr_drbg.h * @@ -38,8 +40,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_CTR_DRBG_H -#define MBEDTLS_CTR_DRBG_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/debug.h b/thirdparty/mbedtls/include/mbedtls/debug.h index 3c08244f3..6192ea7a6 100644 --- a/thirdparty/mbedtls/include/mbedtls/debug.h +++ b/thirdparty/mbedtls/include/mbedtls/debug.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_DEBUG_H +#define MBEDTLS_DEBUG_H /** * \file debug.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_DEBUG_H -#define MBEDTLS_DEBUG_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/des.h b/thirdparty/mbedtls/include/mbedtls/des.h index 325aab536..5fc474205 100644 --- a/thirdparty/mbedtls/include/mbedtls/des.h +++ b/thirdparty/mbedtls/include/mbedtls/des.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_DES_H +#define MBEDTLS_DES_H /** * \file des.h * @@ -24,8 +26,8 @@ * limitations under the License. * */ -#ifndef MBEDTLS_DES_H -#define MBEDTLS_DES_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/dhm.h b/thirdparty/mbedtls/include/mbedtls/dhm.h index c4b15a2c4..a1376e34c 100644 --- a/thirdparty/mbedtls/include/mbedtls/dhm.h +++ b/thirdparty/mbedtls/include/mbedtls/dhm.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_DHM_H +#define MBEDTLS_DHM_H /** * \file dhm.h * @@ -60,8 +62,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_DHM_H -#define MBEDTLS_DHM_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/ecdh.h b/thirdparty/mbedtls/include/mbedtls/ecdh.h index 05855cdf1..5f8bc82c6 100644 --- a/thirdparty/mbedtls/include/mbedtls/ecdh.h +++ b/thirdparty/mbedtls/include/mbedtls/ecdh.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_ECDH_H +#define MBEDTLS_ECDH_H /** * \file ecdh.h * @@ -29,8 +31,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_ECDH_H -#define MBEDTLS_ECDH_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/ecdsa.h b/thirdparty/mbedtls/include/mbedtls/ecdsa.h index 264a638bb..ede8a4691 100644 --- a/thirdparty/mbedtls/include/mbedtls/ecdsa.h +++ b/thirdparty/mbedtls/include/mbedtls/ecdsa.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_ECDSA_H +#define MBEDTLS_ECDSA_H /** * \file ecdsa.h * @@ -27,8 +29,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_ECDSA_H -#define MBEDTLS_ECDSA_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/ecjpake.h b/thirdparty/mbedtls/include/mbedtls/ecjpake.h index 891705d8c..0f298ad95 100644 --- a/thirdparty/mbedtls/include/mbedtls/ecjpake.h +++ b/thirdparty/mbedtls/include/mbedtls/ecjpake.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_ECJPAKE_H +#define MBEDTLS_ECJPAKE_H /** * \file ecjpake.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_ECJPAKE_H -#define MBEDTLS_ECJPAKE_H + + /* * J-PAKE is a password-authenticated key exchange that allows deriving a diff --git a/thirdparty/mbedtls/include/mbedtls/ecp.h b/thirdparty/mbedtls/include/mbedtls/ecp.h index 0924341e0..f34d47bb2 100644 --- a/thirdparty/mbedtls/include/mbedtls/ecp.h +++ b/thirdparty/mbedtls/include/mbedtls/ecp.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_ECP_H +#define MBEDTLS_ECP_H /** * \file ecp.h * @@ -31,8 +33,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_ECP_H -#define MBEDTLS_ECP_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/ecp_internal.h b/thirdparty/mbedtls/include/mbedtls/ecp_internal.h index 6a47a8ff2..b94935c89 100644 --- a/thirdparty/mbedtls/include/mbedtls/ecp_internal.h +++ b/thirdparty/mbedtls/include/mbedtls/ecp_internal.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_ECP_INTERNAL_H +#define MBEDTLS_ECP_INTERNAL_H /** * \file ecp_internal.h * @@ -56,8 +58,8 @@ * Springer Science & Business Media, 1 Aug 2000 */ -#ifndef MBEDTLS_ECP_INTERNAL_H -#define MBEDTLS_ECP_INTERNAL_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/entropy.h b/thirdparty/mbedtls/include/mbedtls/entropy.h index deb3c5030..e7c75fae8 100644 --- a/thirdparty/mbedtls/include/mbedtls/entropy.h +++ b/thirdparty/mbedtls/include/mbedtls/entropy.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_ENTROPY_H +#define MBEDTLS_ENTROPY_H /** * \file entropy.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_ENTROPY_H -#define MBEDTLS_ENTROPY_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/entropy_poll.h b/thirdparty/mbedtls/include/mbedtls/entropy_poll.h index e1d7491aa..698e76d80 100644 --- a/thirdparty/mbedtls/include/mbedtls/entropy_poll.h +++ b/thirdparty/mbedtls/include/mbedtls/entropy_poll.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_ENTROPY_POLL_H +#define MBEDTLS_ENTROPY_POLL_H /** * \file entropy_poll.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_ENTROPY_POLL_H -#define MBEDTLS_ENTROPY_POLL_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/error.h b/thirdparty/mbedtls/include/mbedtls/error.h index 50f253850..f17232997 100644 --- a/thirdparty/mbedtls/include/mbedtls/error.h +++ b/thirdparty/mbedtls/include/mbedtls/error.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_ERROR_H +#define MBEDTLS_ERROR_H /** * \file error.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_ERROR_H -#define MBEDTLS_ERROR_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/gcm.h b/thirdparty/mbedtls/include/mbedtls/gcm.h index 9723a17b6..19b177c7b 100644 --- a/thirdparty/mbedtls/include/mbedtls/gcm.h +++ b/thirdparty/mbedtls/include/mbedtls/gcm.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_GCM_H +#define MBEDTLS_GCM_H /** * \file gcm.h * @@ -28,8 +30,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_GCM_H -#define MBEDTLS_GCM_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/havege.h b/thirdparty/mbedtls/include/mbedtls/havege.h index 7d27039e8..6cad9df68 100644 --- a/thirdparty/mbedtls/include/mbedtls/havege.h +++ b/thirdparty/mbedtls/include/mbedtls/havege.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_HAVEGE_H +#define MBEDTLS_HAVEGE_H /** * \file havege.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_HAVEGE_H -#define MBEDTLS_HAVEGE_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/hkdf.h b/thirdparty/mbedtls/include/mbedtls/hkdf.h index 223004b8e..1304560cf 100644 --- a/thirdparty/mbedtls/include/mbedtls/hkdf.h +++ b/thirdparty/mbedtls/include/mbedtls/hkdf.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_HKDF_H +#define MBEDTLS_HKDF_H /** * \file hkdf.h * @@ -22,8 +24,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_HKDF_H -#define MBEDTLS_HKDF_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/hmac_drbg.h b/thirdparty/mbedtls/include/mbedtls/hmac_drbg.h index 79132d4d9..17dd97feb 100644 --- a/thirdparty/mbedtls/include/mbedtls/hmac_drbg.h +++ b/thirdparty/mbedtls/include/mbedtls/hmac_drbg.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_HMAC_DRBG_H +#define MBEDTLS_HMAC_DRBG_H /** * \file hmac_drbg.h * @@ -23,8 +25,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_HMAC_DRBG_H -#define MBEDTLS_HMAC_DRBG_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/md.h b/thirdparty/mbedtls/include/mbedtls/md.h index 84fafd2ac..009b89f9d 100644 --- a/thirdparty/mbedtls/include/mbedtls/md.h +++ b/thirdparty/mbedtls/include/mbedtls/md.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_MD_H +#define MBEDTLS_MD_H /** * \file md.h * @@ -22,8 +24,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_MD_H -#define MBEDTLS_MD_H + + #include diff --git a/thirdparty/mbedtls/include/mbedtls/md2.h b/thirdparty/mbedtls/include/mbedtls/md2.h index 7f3d5cf44..2ef951ecf 100644 --- a/thirdparty/mbedtls/include/mbedtls/md2.h +++ b/thirdparty/mbedtls/include/mbedtls/md2.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_MD2_H +#define MBEDTLS_MD2_H /** * \file md2.h * @@ -24,8 +26,8 @@ * limitations under the License. * */ -#ifndef MBEDTLS_MD2_H -#define MBEDTLS_MD2_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/md4.h b/thirdparty/mbedtls/include/mbedtls/md4.h index 0238c6723..c5bfefd29 100644 --- a/thirdparty/mbedtls/include/mbedtls/md4.h +++ b/thirdparty/mbedtls/include/mbedtls/md4.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_MD4_H +#define MBEDTLS_MD4_H /** * \file md4.h * @@ -24,8 +26,8 @@ * limitations under the License. * */ -#ifndef MBEDTLS_MD4_H -#define MBEDTLS_MD4_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/md5.h b/thirdparty/mbedtls/include/mbedtls/md5.h index 73e4dd2c2..5fe5cd5fe 100644 --- a/thirdparty/mbedtls/include/mbedtls/md5.h +++ b/thirdparty/mbedtls/include/mbedtls/md5.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_MD5_H +#define MBEDTLS_MD5_H /** * \file md5.h * @@ -23,8 +25,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_MD5_H -#define MBEDTLS_MD5_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/md_internal.h b/thirdparty/mbedtls/include/mbedtls/md_internal.h index f33cdf608..dec5847a8 100644 --- a/thirdparty/mbedtls/include/mbedtls/md_internal.h +++ b/thirdparty/mbedtls/include/mbedtls/md_internal.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_MD_WRAP_H +#define MBEDTLS_MD_WRAP_H /** * \file md_internal.h * @@ -23,8 +25,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_MD_WRAP_H -#define MBEDTLS_MD_WRAP_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/memory_buffer_alloc.h b/thirdparty/mbedtls/include/mbedtls/memory_buffer_alloc.h index 233977252..1ffc875ed 100644 --- a/thirdparty/mbedtls/include/mbedtls/memory_buffer_alloc.h +++ b/thirdparty/mbedtls/include/mbedtls/memory_buffer_alloc.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_MEMORY_BUFFER_ALLOC_H +#define MBEDTLS_MEMORY_BUFFER_ALLOC_H /** * \file memory_buffer_alloc.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_MEMORY_BUFFER_ALLOC_H -#define MBEDTLS_MEMORY_BUFFER_ALLOC_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/net_sockets.h b/thirdparty/mbedtls/include/mbedtls/net_sockets.h index ceb7d5f65..294d391a8 100644 --- a/thirdparty/mbedtls/include/mbedtls/net_sockets.h +++ b/thirdparty/mbedtls/include/mbedtls/net_sockets.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_NET_SOCKETS_H +#define MBEDTLS_NET_SOCKETS_H /** * \file net_sockets.h * @@ -35,8 +37,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_NET_SOCKETS_H -#define MBEDTLS_NET_SOCKETS_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/nist_kw.h b/thirdparty/mbedtls/include/mbedtls/nist_kw.h index 7f3e64a52..419f49fb4 100644 --- a/thirdparty/mbedtls/include/mbedtls/nist_kw.h +++ b/thirdparty/mbedtls/include/mbedtls/nist_kw.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_NIST_KW_H +#define MBEDTLS_NIST_KW_H /** * \file nist_kw.h * @@ -32,8 +34,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_NIST_KW_H -#define MBEDTLS_NIST_KW_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/oid.h b/thirdparty/mbedtls/include/mbedtls/oid.h index 1c39186a4..6a8b205ea 100644 --- a/thirdparty/mbedtls/include/mbedtls/oid.h +++ b/thirdparty/mbedtls/include/mbedtls/oid.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_OID_H +#define MBEDTLS_OID_H /** * \file oid.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_OID_H -#define MBEDTLS_OID_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/padlock.h b/thirdparty/mbedtls/include/mbedtls/padlock.h index 624d02dff..73a2e6f79 100644 --- a/thirdparty/mbedtls/include/mbedtls/padlock.h +++ b/thirdparty/mbedtls/include/mbedtls/padlock.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_PADLOCK_H +#define MBEDTLS_PADLOCK_H /** * \file padlock.h * @@ -23,8 +25,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_PADLOCK_H -#define MBEDTLS_PADLOCK_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/pem.h b/thirdparty/mbedtls/include/mbedtls/pem.h index dfb4ff218..8c59224ff 100644 --- a/thirdparty/mbedtls/include/mbedtls/pem.h +++ b/thirdparty/mbedtls/include/mbedtls/pem.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_PEM_H +#define MBEDTLS_PEM_H /** * \file pem.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_PEM_H -#define MBEDTLS_PEM_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/pk.h b/thirdparty/mbedtls/include/mbedtls/pk.h index 8f2abf2a6..581514e9b 100644 --- a/thirdparty/mbedtls/include/mbedtls/pk.h +++ b/thirdparty/mbedtls/include/mbedtls/pk.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_PK_H +#define MBEDTLS_PK_H /** * \file pk.h * @@ -20,8 +22,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_PK_H -#define MBEDTLS_PK_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/pk_internal.h b/thirdparty/mbedtls/include/mbedtls/pk_internal.h index 47f776770..2b273ad9e 100644 --- a/thirdparty/mbedtls/include/mbedtls/pk_internal.h +++ b/thirdparty/mbedtls/include/mbedtls/pk_internal.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_PK_WRAP_H +#define MBEDTLS_PK_WRAP_H /** * \file pk_internal.h * @@ -20,8 +22,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_PK_WRAP_H -#define MBEDTLS_PK_WRAP_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/pkcs11.h b/thirdparty/mbedtls/include/mbedtls/pkcs11.h index 3530ee168..c2d284d77 100644 --- a/thirdparty/mbedtls/include/mbedtls/pkcs11.h +++ b/thirdparty/mbedtls/include/mbedtls/pkcs11.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_PKCS11_H +#define MBEDTLS_PKCS11_H /** * \file pkcs11.h * @@ -21,8 +23,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_PKCS11_H -#define MBEDTLS_PKCS11_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/pkcs12.h b/thirdparty/mbedtls/include/mbedtls/pkcs12.h index d9e85b1d1..44ebaf2de 100644 --- a/thirdparty/mbedtls/include/mbedtls/pkcs12.h +++ b/thirdparty/mbedtls/include/mbedtls/pkcs12.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_PKCS12_H +#define MBEDTLS_PKCS12_H /** * \file pkcs12.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_PKCS12_H -#define MBEDTLS_PKCS12_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/pkcs5.h b/thirdparty/mbedtls/include/mbedtls/pkcs5.h index 696930f74..186de41f3 100644 --- a/thirdparty/mbedtls/include/mbedtls/pkcs5.h +++ b/thirdparty/mbedtls/include/mbedtls/pkcs5.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_PKCS5_H +#define MBEDTLS_PKCS5_H /** * \file pkcs5.h * @@ -21,8 +23,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_PKCS5_H -#define MBEDTLS_PKCS5_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/platform.h b/thirdparty/mbedtls/include/mbedtls/platform.h index bdef07498..638e66e34 100644 --- a/thirdparty/mbedtls/include/mbedtls/platform.h +++ b/thirdparty/mbedtls/include/mbedtls/platform.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_PLATFORM_H +#define MBEDTLS_PLATFORM_H /** * \file platform.h * @@ -28,8 +30,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_PLATFORM_H -#define MBEDTLS_PLATFORM_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/platform_time.h b/thirdparty/mbedtls/include/mbedtls/platform_time.h index 7e7daab69..448aa5112 100644 --- a/thirdparty/mbedtls/include/mbedtls/platform_time.h +++ b/thirdparty/mbedtls/include/mbedtls/platform_time.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_PLATFORM_TIME_H +#define MBEDTLS_PLATFORM_TIME_H /** * \file platform_time.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_PLATFORM_TIME_H -#define MBEDTLS_PLATFORM_TIME_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/platform_util.h b/thirdparty/mbedtls/include/mbedtls/platform_util.h index f982db8c0..2a7866633 100644 --- a/thirdparty/mbedtls/include/mbedtls/platform_util.h +++ b/thirdparty/mbedtls/include/mbedtls/platform_util.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_PLATFORM_UTIL_H +#define MBEDTLS_PLATFORM_UTIL_H /** * \file platform_util.h * @@ -20,8 +22,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_PLATFORM_UTIL_H -#define MBEDTLS_PLATFORM_UTIL_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/poly1305.h b/thirdparty/mbedtls/include/mbedtls/poly1305.h index a69ede98b..6b8920377 100644 --- a/thirdparty/mbedtls/include/mbedtls/poly1305.h +++ b/thirdparty/mbedtls/include/mbedtls/poly1305.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_POLY1305_H +#define MBEDTLS_POLY1305_H /** * \file poly1305.h * @@ -29,8 +31,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_POLY1305_H -#define MBEDTLS_POLY1305_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/ripemd160.h b/thirdparty/mbedtls/include/mbedtls/ripemd160.h index 63270d123..6706b5078 100644 --- a/thirdparty/mbedtls/include/mbedtls/ripemd160.h +++ b/thirdparty/mbedtls/include/mbedtls/ripemd160.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_RIPEMD160_H +#define MBEDTLS_RIPEMD160_H /** * \file ripemd160.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_RIPEMD160_H -#define MBEDTLS_RIPEMD160_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/rsa.h b/thirdparty/mbedtls/include/mbedtls/rsa.h index 3c481e12a..5bae163be 100644 --- a/thirdparty/mbedtls/include/mbedtls/rsa.h +++ b/thirdparty/mbedtls/include/mbedtls/rsa.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_RSA_H +#define MBEDTLS_RSA_H /** * \file rsa.h * @@ -25,8 +27,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_RSA_H -#define MBEDTLS_RSA_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/rsa_internal.h b/thirdparty/mbedtls/include/mbedtls/rsa_internal.h index d55492bb1..0731e9b9e 100644 --- a/thirdparty/mbedtls/include/mbedtls/rsa_internal.h +++ b/thirdparty/mbedtls/include/mbedtls/rsa_internal.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_RSA_INTERNAL_H +#define MBEDTLS_RSA_INTERNAL_H /** * \file rsa_internal.h * @@ -52,8 +54,8 @@ * */ -#ifndef MBEDTLS_RSA_INTERNAL_H -#define MBEDTLS_RSA_INTERNAL_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/sha1.h b/thirdparty/mbedtls/include/mbedtls/sha1.h index 4c3251b4a..c76e32036 100644 --- a/thirdparty/mbedtls/include/mbedtls/sha1.h +++ b/thirdparty/mbedtls/include/mbedtls/sha1.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_SHA1_H +#define MBEDTLS_SHA1_H /** * \file sha1.h * @@ -26,8 +28,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_SHA1_H -#define MBEDTLS_SHA1_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/sha256.h b/thirdparty/mbedtls/include/mbedtls/sha256.h index 5b54be214..db255adc6 100644 --- a/thirdparty/mbedtls/include/mbedtls/sha256.h +++ b/thirdparty/mbedtls/include/mbedtls/sha256.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_SHA256_H +#define MBEDTLS_SHA256_H /** * \file sha256.h * @@ -22,8 +24,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_SHA256_H -#define MBEDTLS_SHA256_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/sha512.h b/thirdparty/mbedtls/include/mbedtls/sha512.h index cca47c2fe..8ff3e65aa 100644 --- a/thirdparty/mbedtls/include/mbedtls/sha512.h +++ b/thirdparty/mbedtls/include/mbedtls/sha512.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_SHA512_H +#define MBEDTLS_SHA512_H /** * \file sha512.h * \brief This file contains SHA-384 and SHA-512 definitions and functions. @@ -21,8 +23,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_SHA512_H -#define MBEDTLS_SHA512_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/ssl.h b/thirdparty/mbedtls/include/mbedtls/ssl.h index 209dbf605..7a307a581 100644 --- a/thirdparty/mbedtls/include/mbedtls/ssl.h +++ b/thirdparty/mbedtls/include/mbedtls/ssl.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_SSL_H +#define MBEDTLS_SSL_H /** * \file ssl.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_SSL_H -#define MBEDTLS_SSL_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/ssl_cache.h b/thirdparty/mbedtls/include/mbedtls/ssl_cache.h index c6ef2960f..2953b726b 100644 --- a/thirdparty/mbedtls/include/mbedtls/ssl_cache.h +++ b/thirdparty/mbedtls/include/mbedtls/ssl_cache.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_SSL_CACHE_H +#define MBEDTLS_SSL_CACHE_H /** * \file ssl_cache.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_SSL_CACHE_H -#define MBEDTLS_SSL_CACHE_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/ssl_ciphersuites.h b/thirdparty/mbedtls/include/mbedtls/ssl_ciphersuites.h index 93c32a5ed..10e03f6bf 100644 --- a/thirdparty/mbedtls/include/mbedtls/ssl_ciphersuites.h +++ b/thirdparty/mbedtls/include/mbedtls/ssl_ciphersuites.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_SSL_CIPHERSUITES_H +#define MBEDTLS_SSL_CIPHERSUITES_H /** * \file ssl_ciphersuites.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_SSL_CIPHERSUITES_H -#define MBEDTLS_SSL_CIPHERSUITES_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/ssl_cookie.h b/thirdparty/mbedtls/include/mbedtls/ssl_cookie.h index 0a238708e..3c0f71bfe 100644 --- a/thirdparty/mbedtls/include/mbedtls/ssl_cookie.h +++ b/thirdparty/mbedtls/include/mbedtls/ssl_cookie.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_SSL_COOKIE_H +#define MBEDTLS_SSL_COOKIE_H /** * \file ssl_cookie.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_SSL_COOKIE_H -#define MBEDTLS_SSL_COOKIE_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/ssl_internal.h b/thirdparty/mbedtls/include/mbedtls/ssl_internal.h index 6913dc0f6..71414fed0 100644 --- a/thirdparty/mbedtls/include/mbedtls/ssl_internal.h +++ b/thirdparty/mbedtls/include/mbedtls/ssl_internal.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_SSL_INTERNAL_H +#define MBEDTLS_SSL_INTERNAL_H /** * \file ssl_internal.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_SSL_INTERNAL_H -#define MBEDTLS_SSL_INTERNAL_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/ssl_ticket.h b/thirdparty/mbedtls/include/mbedtls/ssl_ticket.h index a882eed23..275ce12ae 100644 --- a/thirdparty/mbedtls/include/mbedtls/ssl_ticket.h +++ b/thirdparty/mbedtls/include/mbedtls/ssl_ticket.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_SSL_TICKET_H +#define MBEDTLS_SSL_TICKET_H /** * \file ssl_ticket.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_SSL_TICKET_H -#define MBEDTLS_SSL_TICKET_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/threading.h b/thirdparty/mbedtls/include/mbedtls/threading.h index d147c73f0..8ec619d6a 100644 --- a/thirdparty/mbedtls/include/mbedtls/threading.h +++ b/thirdparty/mbedtls/include/mbedtls/threading.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_THREADING_H +#define MBEDTLS_THREADING_H /** * \file threading.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_THREADING_H -#define MBEDTLS_THREADING_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/timing.h b/thirdparty/mbedtls/include/mbedtls/timing.h index b7290cfca..0007ea83c 100644 --- a/thirdparty/mbedtls/include/mbedtls/timing.h +++ b/thirdparty/mbedtls/include/mbedtls/timing.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_TIMING_H +#define MBEDTLS_TIMING_H /** * \file timing.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_TIMING_H -#define MBEDTLS_TIMING_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/version.h b/thirdparty/mbedtls/include/mbedtls/version.h index b1a92b2bc..6ada82858 100644 --- a/thirdparty/mbedtls/include/mbedtls/version.h +++ b/thirdparty/mbedtls/include/mbedtls/version.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_VERSION_H +#define MBEDTLS_VERSION_H /** * \file version.h * @@ -23,8 +25,8 @@ * This set of compile-time defines and run-time variables can be used to * determine the version number of the mbed TLS library used. */ -#ifndef MBEDTLS_VERSION_H -#define MBEDTLS_VERSION_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/x509.h b/thirdparty/mbedtls/include/mbedtls/x509.h index c17750143..d35bf1589 100644 --- a/thirdparty/mbedtls/include/mbedtls/x509.h +++ b/thirdparty/mbedtls/include/mbedtls/x509.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_X509_H +#define MBEDTLS_X509_H /** * \file x509.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_X509_H -#define MBEDTLS_X509_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/x509_crl.h b/thirdparty/mbedtls/include/mbedtls/x509_crl.h index 7e9e8885f..3a846d9cd 100644 --- a/thirdparty/mbedtls/include/mbedtls/x509_crl.h +++ b/thirdparty/mbedtls/include/mbedtls/x509_crl.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_X509_CRL_H +#define MBEDTLS_X509_CRL_H /** * \file x509_crl.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_X509_CRL_H -#define MBEDTLS_X509_CRL_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/x509_crt.h b/thirdparty/mbedtls/include/mbedtls/x509_crt.h index 64ccb433b..42fe74e72 100644 --- a/thirdparty/mbedtls/include/mbedtls/x509_crt.h +++ b/thirdparty/mbedtls/include/mbedtls/x509_crt.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_X509_CRT_H +#define MBEDTLS_X509_CRT_H /** * \file x509_crt.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_X509_CRT_H -#define MBEDTLS_X509_CRT_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/x509_csr.h b/thirdparty/mbedtls/include/mbedtls/x509_csr.h index b1dfc21f1..ebb8ad33f 100644 --- a/thirdparty/mbedtls/include/mbedtls/x509_csr.h +++ b/thirdparty/mbedtls/include/mbedtls/x509_csr.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_X509_CSR_H +#define MBEDTLS_X509_CSR_H /** * \file x509_csr.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_X509_CSR_H -#define MBEDTLS_X509_CSR_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/include/mbedtls/xtea.h b/thirdparty/mbedtls/include/mbedtls/xtea.h index 4bdc711fd..7c33b4354 100644 --- a/thirdparty/mbedtls/include/mbedtls/xtea.h +++ b/thirdparty/mbedtls/include/mbedtls/xtea.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_XTEA_H +#define MBEDTLS_XTEA_H /** * \file xtea.h * @@ -19,8 +21,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_XTEA_H -#define MBEDTLS_XTEA_H + + #if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h" diff --git a/thirdparty/mbedtls/library/check_crypto_config.h b/thirdparty/mbedtls/library/check_crypto_config.h index d7ad16a61..1d032a9f0 100644 --- a/thirdparty/mbedtls/library/check_crypto_config.h +++ b/thirdparty/mbedtls/library/check_crypto_config.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CHECK_CRYPTO_CONFIG_H +#define MBEDTLS_CHECK_CRYPTO_CONFIG_H /** * \file check_crypto_config.h * @@ -25,8 +27,8 @@ * in order to catch dependency issues early. */ -#ifndef MBEDTLS_CHECK_CRYPTO_CONFIG_H -#define MBEDTLS_CHECK_CRYPTO_CONFIG_H + + #if defined(PSA_WANT_ALG_CCM) && \ !( defined(PSA_WANT_KEY_TYPE_AES) || \ diff --git a/thirdparty/mbedtls/library/common.h b/thirdparty/mbedtls/library/common.h index c06472418..372a24e63 100644 --- a/thirdparty/mbedtls/library/common.h +++ b/thirdparty/mbedtls/library/common.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_LIBRARY_COMMON_H +#define MBEDTLS_LIBRARY_COMMON_H /** * \file common.h * @@ -20,8 +22,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_LIBRARY_COMMON_H -#define MBEDTLS_LIBRARY_COMMON_H + + #if defined(MBEDTLS_CONFIG_FILE) #include MBEDTLS_CONFIG_FILE diff --git a/thirdparty/mbedtls/library/constant_time_internal.h b/thirdparty/mbedtls/library/constant_time_internal.h index bbb3a9067..2405972bf 100644 --- a/thirdparty/mbedtls/library/constant_time_internal.h +++ b/thirdparty/mbedtls/library/constant_time_internal.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CONSTANT_TIME_INTERNAL_H +#define MBEDTLS_CONSTANT_TIME_INTERNAL_H /** * Constant-time functions * @@ -17,8 +19,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_CONSTANT_TIME_INTERNAL_H -#define MBEDTLS_CONSTANT_TIME_INTERNAL_H + + #include "common.h" diff --git a/thirdparty/mbedtls/library/constant_time_invasive.h b/thirdparty/mbedtls/library/constant_time_invasive.h index 4620ca137..3eb9b2004 100644 --- a/thirdparty/mbedtls/library/constant_time_invasive.h +++ b/thirdparty/mbedtls/library/constant_time_invasive.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_CONSTANT_TIME_INVASIVE_H +#define MBEDTLS_CONSTANT_TIME_INVASIVE_H /** * \file constant_time_invasive.h * @@ -24,8 +26,8 @@ * limitations under the License. */ -#ifndef MBEDTLS_CONSTANT_TIME_INVASIVE_H -#define MBEDTLS_CONSTANT_TIME_INVASIVE_H + + #include "common.h" diff --git a/thirdparty/mbedtls/library/ecp_invasive.h b/thirdparty/mbedtls/library/ecp_invasive.h index 71c770275..fcfc940cc 100644 --- a/thirdparty/mbedtls/library/ecp_invasive.h +++ b/thirdparty/mbedtls/library/ecp_invasive.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_ECP_INVASIVE_H +#define MBEDTLS_ECP_INVASIVE_H /** * \file ecp_invasive.h * @@ -23,8 +25,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MBEDTLS_ECP_INVASIVE_H -#define MBEDTLS_ECP_INVASIVE_H + + #include "common.h" #include "mbedtls/bignum.h" diff --git a/thirdparty/mbedtls/library/mps_common.h b/thirdparty/mbedtls/library/mps_common.h index d20776f15..5df45e0d0 100644 --- a/thirdparty/mbedtls/library/mps_common.h +++ b/thirdparty/mbedtls/library/mps_common.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_MPS_COMMON_H +#define MBEDTLS_MPS_COMMON_H /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 @@ -23,8 +25,8 @@ * \brief Common functions and macros used by MPS */ -#ifndef MBEDTLS_MPS_COMMON_H -#define MBEDTLS_MPS_COMMON_H + + #include "mps_error.h" diff --git a/thirdparty/mbedtls/library/mps_error.h b/thirdparty/mbedtls/library/mps_error.h index f78d9a05f..38466bb65 100644 --- a/thirdparty/mbedtls/library/mps_error.h +++ b/thirdparty/mbedtls/library/mps_error.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_MPS_ERROR_H +#define MBEDTLS_MPS_ERROR_H /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 @@ -23,8 +25,8 @@ * \brief Error codes used by MPS */ -#ifndef MBEDTLS_MPS_ERROR_H -#define MBEDTLS_MPS_ERROR_H + + /* TODO: The error code allocation needs to be revisited: diff --git a/thirdparty/mbedtls/library/mps_reader.h b/thirdparty/mbedtls/library/mps_reader.h index 427c1bd25..bb2ea4e70 100644 --- a/thirdparty/mbedtls/library/mps_reader.h +++ b/thirdparty/mbedtls/library/mps_reader.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_READER_H +#define MBEDTLS_READER_H /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 @@ -119,8 +121,8 @@ * */ -#ifndef MBEDTLS_READER_H -#define MBEDTLS_READER_H + + #include diff --git a/thirdparty/mbedtls/library/mps_trace.h b/thirdparty/mbedtls/library/mps_trace.h index 7c2360118..ec00a1db7 100644 --- a/thirdparty/mbedtls/library/mps_trace.h +++ b/thirdparty/mbedtls/library/mps_trace.h @@ -1,3 +1,5 @@ +#ifndef MBEDTLS_MPS_MBEDTLS_MPS_TRACE_H +#define MBEDTLS_MPS_MBEDTLS_MPS_TRACE_H /* * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 @@ -23,8 +25,8 @@ * \brief Tracing module for MPS */ -#ifndef MBEDTLS_MPS_MBEDTLS_MPS_TRACE_H -#define MBEDTLS_MPS_MBEDTLS_MPS_TRACE_H + + #include "common.h" #include "mps_common.h" diff --git a/thirdparty/miniupnpc/miniupnpc/addr_is_reserved.h b/thirdparty/miniupnpc/miniupnpc/addr_is_reserved.h index f8b5d66a0..af866c469 100644 --- a/thirdparty/miniupnpc/miniupnpc/addr_is_reserved.h +++ b/thirdparty/miniupnpc/miniupnpc/addr_is_reserved.h @@ -1,3 +1,5 @@ +#ifndef ADDR_IS_RESERVED_H_INCLUDED +#define ADDR_IS_RESERVED_H_INCLUDED /* $Id: $ */ /* vim: tabstop=4 shiftwidth=4 noexpandtab * Project: miniupnp @@ -6,8 +8,8 @@ * Copyright (c) 2005-2020 Thomas Bernard * This software is subjects to the conditions detailed * in the LICENCE file provided within this distribution */ -#ifndef ADDR_IS_RESERVED_H_INCLUDED -#define ADDR_IS_RESERVED_H_INCLUDED + + int addr_is_reserved(const char * addr_str); diff --git a/thirdparty/miniupnpc/miniupnpc/codelength.h b/thirdparty/miniupnpc/miniupnpc/codelength.h index ea0b005ff..23569af62 100644 --- a/thirdparty/miniupnpc/miniupnpc/codelength.h +++ b/thirdparty/miniupnpc/miniupnpc/codelength.h @@ -1,11 +1,13 @@ +#ifndef CODELENGTH_H_INCLUDED +#define CODELENGTH_H_INCLUDED /* $Id: codelength.h,v 1.3 2011/07/30 13:10:05 nanard Exp $ */ /* Project : miniupnp * Author : Thomas BERNARD * copyright (c) 2005-2015 Thomas Bernard * This software is subjet to the conditions detailed in the * provided LICENCE file. */ -#ifndef CODELENGTH_H_INCLUDED -#define CODELENGTH_H_INCLUDED + + /* Encode length by using 7bit per Byte : * Most significant bit of each byte specifies that the diff --git a/thirdparty/miniupnpc/miniupnpc/connecthostport.h b/thirdparty/miniupnpc/miniupnpc/connecthostport.h index 701816b5b..9a5adf1d0 100644 --- a/thirdparty/miniupnpc/miniupnpc/connecthostport.h +++ b/thirdparty/miniupnpc/miniupnpc/connecthostport.h @@ -1,3 +1,5 @@ +#ifndef CONNECTHOSTPORT_H_INCLUDED +#define CONNECTHOSTPORT_H_INCLUDED /* $Id: connecthostport.h,v 1.2 2012/06/23 22:32:33 nanard Exp $ */ /* Project: miniupnp * http://miniupnp.free.fr/ @@ -5,8 +7,8 @@ * Copyright (c) 2010-2018 Thomas Bernard * This software is subjects to the conditions detailed * in the LICENCE file provided within this distribution */ -#ifndef CONNECTHOSTPORT_H_INCLUDED -#define CONNECTHOSTPORT_H_INCLUDED + + #include "miniupnpc_socketdef.h" diff --git a/thirdparty/miniupnpc/miniupnpc/igd_desc_parse.h b/thirdparty/miniupnpc/miniupnpc/igd_desc_parse.h index 0de546b69..d125c9650 100644 --- a/thirdparty/miniupnpc/miniupnpc/igd_desc_parse.h +++ b/thirdparty/miniupnpc/miniupnpc/igd_desc_parse.h @@ -1,3 +1,5 @@ +#ifndef IGD_DESC_PARSE_H_INCLUDED +#define IGD_DESC_PARSE_H_INCLUDED /* $Id: igd_desc_parse.h,v 1.12 2014/11/17 17:19:13 nanard Exp $ */ /* Project : miniupnp * http://miniupnp.free.fr/ @@ -6,8 +8,8 @@ * This software is subject to the conditions detailed in the * LICENCE file provided in this distribution. * */ -#ifndef IGD_DESC_PARSE_H_INCLUDED -#define IGD_DESC_PARSE_H_INCLUDED + + /* Structure to store the result of the parsing of UPnP * descriptions of Internet Gateway Devices */ diff --git a/thirdparty/miniupnpc/miniupnpc/minisoap.h b/thirdparty/miniupnpc/miniupnpc/minisoap.h index d6a45d03b..481337659 100644 --- a/thirdparty/miniupnpc/miniupnpc/minisoap.h +++ b/thirdparty/miniupnpc/miniupnpc/minisoap.h @@ -1,11 +1,13 @@ +#ifndef MINISOAP_H_INCLUDED +#define MINISOAP_H_INCLUDED /* $Id: minisoap.h,v 1.4 2010/04/12 20:39:41 nanard Exp $ */ /* Project : miniupnp * Author : Thomas Bernard * Copyright (c) 2005-2018 Thomas Bernard * This software is subject to the conditions detailed in the * LICENCE file provided in this distribution. */ -#ifndef MINISOAP_H_INCLUDED -#define MINISOAP_H_INCLUDED + + #include "miniupnpc_socketdef.h" diff --git a/thirdparty/miniupnpc/miniupnpc/minissdpc.h b/thirdparty/miniupnpc/miniupnpc/minissdpc.h index c99f929b9..3f32a443a 100644 --- a/thirdparty/miniupnpc/miniupnpc/minissdpc.h +++ b/thirdparty/miniupnpc/miniupnpc/minissdpc.h @@ -1,3 +1,5 @@ +#ifndef MINISSDPC_H_INCLUDED +#define MINISSDPC_H_INCLUDED /* $Id: minissdpc.h,v 1.6 2015/09/18 12:45:16 nanard Exp $ */ /* Project: miniupnp * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ @@ -5,8 +7,8 @@ * Copyright (c) 2005-2015 Thomas Bernard * This software is subjects to the conditions detailed * in the LICENCE file provided within this distribution */ -#ifndef MINISSDPC_H_INCLUDED -#define MINISSDPC_H_INCLUDED + + #include "miniupnpc_declspec.h" #include "upnpdev.h" diff --git a/thirdparty/miniupnpc/miniupnpc/miniupnpc.h b/thirdparty/miniupnpc/miniupnpc/miniupnpc.h index 3aef8ea44..778aaf62b 100644 --- a/thirdparty/miniupnpc/miniupnpc/miniupnpc.h +++ b/thirdparty/miniupnpc/miniupnpc/miniupnpc.h @@ -1,3 +1,5 @@ +#ifndef MINIUPNPC_H_INCLUDED +#define MINIUPNPC_H_INCLUDED /* $Id: miniupnpc.h,v 1.58 2021/03/02 23:49:52 nanard Exp $ */ /* vim: tabstop=4 shiftwidth=4 noexpandtab * Project: miniupnp @@ -6,8 +8,8 @@ * Copyright (c) 2005-2021 Thomas Bernard * This software is subjects to the conditions detailed * in the LICENCE file provided within this distribution */ -#ifndef MINIUPNPC_H_INCLUDED -#define MINIUPNPC_H_INCLUDED + + #include "miniupnpc_declspec.h" #include "igd_desc_parse.h" diff --git a/thirdparty/miniupnpc/miniupnpc/miniupnpc_socketdef.h b/thirdparty/miniupnpc/miniupnpc/miniupnpc_socketdef.h index 5986e58c7..02aba0a80 100644 --- a/thirdparty/miniupnpc/miniupnpc/miniupnpc_socketdef.h +++ b/thirdparty/miniupnpc/miniupnpc/miniupnpc_socketdef.h @@ -1,11 +1,13 @@ +#ifndef MINIUPNPC_SOCKETDEF_H_INCLUDED +#define MINIUPNPC_SOCKETDEF_H_INCLUDED /* $Id: miniupnpc_socketdef.h,v 1.1 2018/03/13 23:44:10 nanard Exp $ */ /* Miniupnp project : http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/ * Author : Thomas Bernard * Copyright (c) 2018 Thomas Bernard * This software is subject to the conditions detailed in the * LICENCE file provided within this distribution */ -#ifndef MINIUPNPC_SOCKETDEF_H_INCLUDED -#define MINIUPNPC_SOCKETDEF_H_INCLUDED + + #ifdef _WIN32 diff --git a/thirdparty/miniupnpc/miniupnpc/miniupnpctypes.h b/thirdparty/miniupnpc/miniupnpc/miniupnpctypes.h index 307ce3969..09b191071 100644 --- a/thirdparty/miniupnpc/miniupnpc/miniupnpctypes.h +++ b/thirdparty/miniupnpc/miniupnpc/miniupnpctypes.h @@ -1,11 +1,13 @@ +#ifndef MINIUPNPCTYPES_H_INCLUDED +#define MINIUPNPCTYPES_H_INCLUDED /* $Id: miniupnpctypes.h,v 1.1 2011/02/15 11:10:40 nanard Exp $ */ /* Miniupnp project : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org * Author : Thomas Bernard * Copyright (c) 2011 Thomas Bernard * This software is subject to the conditions detailed in the * LICENCE file provided within this distribution */ -#ifndef MINIUPNPCTYPES_H_INCLUDED -#define MINIUPNPCTYPES_H_INCLUDED + + #if (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) #define UNSIGNED_INTEGER unsigned long long diff --git a/thirdparty/miniupnpc/miniupnpc/miniwget.h b/thirdparty/miniupnpc/miniupnpc/miniwget.h index f5572c254..2a89b4c8f 100644 --- a/thirdparty/miniupnpc/miniupnpc/miniwget.h +++ b/thirdparty/miniupnpc/miniupnpc/miniwget.h @@ -1,3 +1,5 @@ +#ifndef MINIWGET_H_INCLUDED +#define MINIWGET_H_INCLUDED /* $Id: miniwget.h,v 1.12 2016/01/24 17:24:36 nanard Exp $ */ /* Project : miniupnp * Author : Thomas Bernard @@ -5,8 +7,8 @@ * This software is subject to the conditions detailed in the * LICENCE file provided in this distribution. * */ -#ifndef MINIWGET_H_INCLUDED -#define MINIWGET_H_INCLUDED + + #include "miniupnpc_declspec.h" diff --git a/thirdparty/miniupnpc/miniupnpc/miniwget_private.h b/thirdparty/miniupnpc/miniupnpc/miniwget_private.h index e4eaac808..d3e46a0f3 100644 --- a/thirdparty/miniupnpc/miniupnpc/miniwget_private.h +++ b/thirdparty/miniupnpc/miniupnpc/miniwget_private.h @@ -1,3 +1,5 @@ +#ifndef MINIWGET_INTERNAL_H_INCLUDED +#define MINIWGET_INTERNAL_H_INCLUDED /* $Id: miniwget_private.h,v 1.1 2018/04/06 10:17:58 nanard Exp $ */ /* Project : miniupnp * Author : Thomas Bernard @@ -5,8 +7,8 @@ * This software is subject to the conditions detailed in the * LICENCE file provided in this distribution. * */ -#ifndef MINIWGET_INTERNAL_H_INCLUDED -#define MINIWGET_INTERNAL_H_INCLUDED + + #include "miniupnpc_socketdef.h" diff --git a/thirdparty/miniupnpc/miniupnpc/minixml.h b/thirdparty/miniupnpc/miniupnpc/minixml.h index 2e6039738..91d265821 100644 --- a/thirdparty/miniupnpc/miniupnpc/minixml.h +++ b/thirdparty/miniupnpc/miniupnpc/minixml.h @@ -1,3 +1,5 @@ +#ifndef MINIXML_H_INCLUDED +#define MINIXML_H_INCLUDED /* $Id: minixml.h,v 1.6 2006/11/30 11:47:21 nanard Exp $ */ /* minimal xml parser * @@ -8,8 +10,8 @@ * This software is subject to the conditions detailed in the * LICENCE file provided in this distribution. * */ -#ifndef MINIXML_H_INCLUDED -#define MINIXML_H_INCLUDED + + #define IS_WHITE_SPACE(c) ((c)==' ' || (c)=='\t' || (c)=='\r' || (c)=='\n') /* if a callback function pointer is set to NULL, diff --git a/thirdparty/miniupnpc/miniupnpc/portlistingparse.h b/thirdparty/miniupnpc/miniupnpc/portlistingparse.h index e3957a3f4..f0b471dd9 100644 --- a/thirdparty/miniupnpc/miniupnpc/portlistingparse.h +++ b/thirdparty/miniupnpc/miniupnpc/portlistingparse.h @@ -1,11 +1,13 @@ +#ifndef PORTLISTINGPARSE_H_INCLUDED +#define PORTLISTINGPARSE_H_INCLUDED /* $Id: portlistingparse.h,v 1.10 2014/11/01 10:37:32 nanard Exp $ */ /* MiniUPnP project * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * (c) 2011-2015 Thomas Bernard * This software is subject to the conditions detailed * in the LICENCE file provided within the distribution */ -#ifndef PORTLISTINGPARSE_H_INCLUDED -#define PORTLISTINGPARSE_H_INCLUDED + + #include "miniupnpc_declspec.h" /* for the definition of UNSIGNED_INTEGER */ diff --git a/thirdparty/miniupnpc/miniupnpc/receivedata.h b/thirdparty/miniupnpc/miniupnpc/receivedata.h index c9fdc561f..937d3ade1 100644 --- a/thirdparty/miniupnpc/miniupnpc/receivedata.h +++ b/thirdparty/miniupnpc/miniupnpc/receivedata.h @@ -1,3 +1,5 @@ +#ifndef RECEIVEDATA_H_INCLUDED +#define RECEIVEDATA_H_INCLUDED /* $Id: receivedata.h,v 1.3 2012/06/23 22:34:47 nanard Exp $ */ /* Project: miniupnp * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ @@ -5,8 +7,8 @@ * Copyright (c) 2011-2018 Thomas Bernard * This software is subjects to the conditions detailed * in the LICENCE file provided within this distribution */ -#ifndef RECEIVEDATA_H_INCLUDED -#define RECEIVEDATA_H_INCLUDED + + #include "miniupnpc_socketdef.h" diff --git a/thirdparty/miniupnpc/miniupnpc/upnpcommands.h b/thirdparty/miniupnpc/miniupnpc/upnpcommands.h index 1b6d44773..baba4679c 100644 --- a/thirdparty/miniupnpc/miniupnpc/upnpcommands.h +++ b/thirdparty/miniupnpc/miniupnpc/upnpcommands.h @@ -1,11 +1,13 @@ +#ifndef UPNPCOMMANDS_H_INCLUDED +#define UPNPCOMMANDS_H_INCLUDED /* $Id: upnpcommands.h,v 1.32 2018/03/13 23:34:47 nanard Exp $ */ /* Miniupnp project : http://miniupnp.free.fr/ * Author : Thomas Bernard * Copyright (c) 2005-2018 Thomas Bernard * This software is subject to the conditions detailed in the * LICENCE file provided within this distribution */ -#ifndef UPNPCOMMANDS_H_INCLUDED -#define UPNPCOMMANDS_H_INCLUDED + + #include "miniupnpc_declspec.h" #include "miniupnpctypes.h" diff --git a/thirdparty/miniupnpc/miniupnpc/upnpdev.h b/thirdparty/miniupnpc/miniupnpc/upnpdev.h index 9b2cb431b..e84adacbc 100644 --- a/thirdparty/miniupnpc/miniupnpc/upnpdev.h +++ b/thirdparty/miniupnpc/miniupnpc/upnpdev.h @@ -1,3 +1,5 @@ +#ifndef UPNPDEV_H_INCLUDED +#define UPNPDEV_H_INCLUDED /* $Id: upnpdev.h,v 1.3 2020/05/29 15:57:42 nanard Exp $ */ /* Project : miniupnp * Web : http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/ @@ -5,8 +7,8 @@ * copyright (c) 2005-2020 Thomas Bernard * This software is subjet to the conditions detailed in the * provided LICENSE file. */ -#ifndef UPNPDEV_H_INCLUDED -#define UPNPDEV_H_INCLUDED + + #include "miniupnpc_declspec.h" diff --git a/thirdparty/miniupnpc/miniupnpc/upnpreplyparse.h b/thirdparty/miniupnpc/miniupnpc/upnpreplyparse.h index 6badd15b2..4cb548a9a 100644 --- a/thirdparty/miniupnpc/miniupnpc/upnpreplyparse.h +++ b/thirdparty/miniupnpc/miniupnpc/upnpreplyparse.h @@ -1,3 +1,5 @@ +#ifndef UPNPREPLYPARSE_H_INCLUDED +#define UPNPREPLYPARSE_H_INCLUDED /* $Id: upnpreplyparse.h,v 1.19 2014/10/27 16:33:19 nanard Exp $ */ /* MiniUPnP project * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ @@ -5,8 +7,8 @@ * This software is subject to the conditions detailed * in the LICENCE file provided within the distribution */ -#ifndef UPNPREPLYPARSE_H_INCLUDED -#define UPNPREPLYPARSE_H_INCLUDED + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/miniupnpc/miniupnpc/win32_snprintf.h b/thirdparty/miniupnpc/miniupnpc/win32_snprintf.h index 1fc284ecf..cafd91a2d 100644 --- a/thirdparty/miniupnpc/miniupnpc/win32_snprintf.h +++ b/thirdparty/miniupnpc/miniupnpc/win32_snprintf.h @@ -1,3 +1,5 @@ +#ifndef WIN32_SNPRINTF_H +#define WIN32_SNPRINTF_H /* vim: tabstop=4 shiftwidth=4 noexpandtab * MiniUPnP project * http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/ @@ -5,8 +7,8 @@ * This software is subject to the conditions detailed * in the LICENCE file provided within the distribution */ -#ifndef WIN32_SNPRINTF_H -#define WIN32_SNPRINTF_H + + #ifdef _WIN32 diff --git a/thirdparty/minizip/ioapi.h b/thirdparty/minizip/ioapi.h index 4011e9cab..5e0f7a577 100644 --- a/thirdparty/minizip/ioapi.h +++ b/thirdparty/minizip/ioapi.h @@ -1,3 +1,5 @@ +#ifndef _ZLIBIOAPI64_H +#define _ZLIBIOAPI64_H /* ioapi.h -- IO base function header for compress/uncompress .zip part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) @@ -18,8 +20,8 @@ */ -#ifndef _ZLIBIOAPI64_H -#define _ZLIBIOAPI64_H + + #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) diff --git a/thirdparty/minizip/unzip.h b/thirdparty/minizip/unzip.h index bab1cb939..6dee021f0 100644 --- a/thirdparty/minizip/unzip.h +++ b/thirdparty/minizip/unzip.h @@ -1,3 +1,5 @@ +#ifndef _unz64_H +#define _unz64_H /* unzip.h -- IO for uncompress .zip files using zlib Version 1.1, February 14h, 2010 part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) @@ -40,8 +42,8 @@ */ -#ifndef _unz64_H -#define _unz64_H + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/minizip/zip.h b/thirdparty/minizip/zip.h index 8aaebb623..8943a87d0 100644 --- a/thirdparty/minizip/zip.h +++ b/thirdparty/minizip/zip.h @@ -1,3 +1,5 @@ +#ifndef _zip12_H +#define _zip12_H /* zip.h -- IO on .zip files using zlib Version 1.1, February 14h, 2010 part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) @@ -37,8 +39,8 @@ */ -#ifndef _zip12_H -#define _zip12_H + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/misc/fastlz.h b/thirdparty/misc/fastlz.h index e53dbfbb5..4363a8308 100644 --- a/thirdparty/misc/fastlz.h +++ b/thirdparty/misc/fastlz.h @@ -1,3 +1,5 @@ +#ifndef FASTLZ_H +#define FASTLZ_H /* FastLZ - Byte-aligned LZ77 compression library Copyright (C) 2005-2020 Ariya Hidayat @@ -21,8 +23,8 @@ THE SOFTWARE. */ -#ifndef FASTLZ_H -#define FASTLZ_H + + #define FASTLZ_VERSION 0x000500 diff --git a/thirdparty/misc/ifaddrs-android.h b/thirdparty/misc/ifaddrs-android.h index 8de94324b..6b70a1516 100644 --- a/thirdparty/misc/ifaddrs-android.h +++ b/thirdparty/misc/ifaddrs-android.h @@ -1,3 +1,5 @@ +#ifndef TALK_BASE_IFADDRS_ANDROID_H_ +#define TALK_BASE_IFADDRS_ANDROID_H_ /* * libjingle * Copyright 2013, Google Inc. @@ -24,8 +26,8 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TALK_BASE_IFADDRS_ANDROID_H_ -#define TALK_BASE_IFADDRS_ANDROID_H_ + + #include #include // Implementation of getifaddrs for Android. diff --git a/thirdparty/misc/mikktspace.h b/thirdparty/misc/mikktspace.h index 52c44a713..f3e009a39 100644 --- a/thirdparty/misc/mikktspace.h +++ b/thirdparty/misc/mikktspace.h @@ -1,3 +1,5 @@ +#ifndef __MIKKTSPACE_H__ +#define __MIKKTSPACE_H__ /** \file mikktspace/mikktspace.h * \ingroup mikktspace */ @@ -21,8 +23,8 @@ * 3. This notice may not be removed or altered from any source distribution. */ -#ifndef __MIKKTSPACE_H__ -#define __MIKKTSPACE_H__ + + #ifdef __cplusplus diff --git a/thirdparty/misc/pcg.h b/thirdparty/misc/pcg.h index 6f42b3b09..1e7421f67 100644 --- a/thirdparty/misc/pcg.h +++ b/thirdparty/misc/pcg.h @@ -1,8 +1,10 @@ +#ifndef RANDOM_H +#define RANDOM_H // *Really* minimal PCG32 code / (c) 2014 M.E. O'Neill / pcg-random.org // Licensed under Apache License 2.0 (NO WARRANTY, etc. see website) -#ifndef RANDOM_H -#define RANDOM_H + + #include "core/typedefs.h" diff --git a/thirdparty/misc/smaz.h b/thirdparty/misc/smaz.h index a9d8a337a..5d9f252d4 100644 --- a/thirdparty/misc/smaz.h +++ b/thirdparty/misc/smaz.h @@ -1,3 +1,5 @@ +#ifndef _SMAZ_H +#define _SMAZ_H /* Copyright (c) 2006-2009, Salvatore Sanfilippo All rights reserved. @@ -11,8 +13,8 @@ Redistribution and use in source and binary forms, with or without modification, 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. */ -#ifndef _SMAZ_H -#define _SMAZ_H + + int smaz_compress(const char *in, int inlen, char *out, int outlen); int smaz_decompress(const char *in, int inlen, char *out, int outlen); diff --git a/thirdparty/misc/triangulator.h b/thirdparty/misc/triangulator.h index c85792fd5..95d2a6dc2 100644 --- a/thirdparty/misc/triangulator.h +++ b/thirdparty/misc/triangulator.h @@ -1,3 +1,5 @@ +#ifndef TRIANGULATOR_H +#define TRIANGULATOR_H //Copyright (C) 2011 by Ivan Fratric // //Permission is hereby granted, free of charge, to any person obtaining a copy @@ -18,8 +20,8 @@ //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN //THE SOFTWARE. -#ifndef TRIANGULATOR_H -#define TRIANGULATOR_H + + #include "core/list.h" #include "core/math/vector2.h" diff --git a/thirdparty/misc/yuv2rgb.h b/thirdparty/misc/yuv2rgb.h index d8f7fd6de..9620ed4ec 100644 --- a/thirdparty/misc/yuv2rgb.h +++ b/thirdparty/misc/yuv2rgb.h @@ -1,3 +1,5 @@ +#ifndef YUV2RGB_H +#define YUV2RGB_H /* Thirdparty code presumably from http://wss.co.uk/pinknoise/yuv2rgb/ */ /* @@ -32,8 +34,8 @@ ship it. * 4. Removing unused 'dither' parameter */ -#ifndef YUV2RGB_H -#define YUV2RGB_H + + #include "core/typedefs.h" diff --git a/thirdparty/nanosvg/nanosvg.h b/thirdparty/nanosvg/nanosvg.h index f5058b179..78fbe78a0 100644 --- a/thirdparty/nanosvg/nanosvg.h +++ b/thirdparty/nanosvg/nanosvg.h @@ -1,3 +1,5 @@ +#ifndef NANOSVG_H +#define NANOSVG_H /* * Copyright (c) 2013-14 Mikko Mononen memon@inside.org * @@ -26,8 +28,8 @@ * */ -#ifndef NANOSVG_H -#define NANOSVG_H + + #ifndef NANOSVG_CPLUSPLUS #ifdef __cplusplus diff --git a/thirdparty/nanosvg/nanosvgrast.h b/thirdparty/nanosvg/nanosvgrast.h index b740c316c..a0f3d2a98 100644 --- a/thirdparty/nanosvg/nanosvgrast.h +++ b/thirdparty/nanosvg/nanosvgrast.h @@ -1,3 +1,5 @@ +#ifndef NANOSVGRAST_H +#define NANOSVGRAST_H /* * Copyright (c) 2013-14 Mikko Mononen memon@inside.org * @@ -22,8 +24,8 @@ * */ -#ifndef NANOSVGRAST_H -#define NANOSVGRAST_H + + #ifndef NANOSVGRAST_CPLUSPLUS #ifdef __cplusplus diff --git a/thirdparty/opus/analysis.h b/thirdparty/opus/analysis.h index 9eae56a52..fdb01bd50 100644 --- a/thirdparty/opus/analysis.h +++ b/thirdparty/opus/analysis.h @@ -1,3 +1,5 @@ +#ifndef ANALYSIS_H +#define ANALYSIS_H /* Copyright (c) 2011 Xiph.Org Foundation Written by Jean-Marc Valin */ /* @@ -25,8 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANALYSIS_H -#define ANALYSIS_H + + #include "celt.h" #include "opus_private.h" diff --git a/thirdparty/opus/celt/_kiss_fft_guts.h b/thirdparty/opus/celt/_kiss_fft_guts.h index 5e3d58fd6..6536c4c7b 100644 --- a/thirdparty/opus/celt/_kiss_fft_guts.h +++ b/thirdparty/opus/celt/_kiss_fft_guts.h @@ -1,3 +1,5 @@ +#ifndef KISS_FFT_GUTS_H +#define KISS_FFT_GUTS_H /*Copyright (c) 2003-2004, Mark Borgerding All rights reserved. @@ -23,8 +25,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ -#ifndef KISS_FFT_GUTS_H -#define KISS_FFT_GUTS_H + + #define MIN(a,b) ((a)<(b) ? (a):(b)) #define MAX(a,b) ((a)>(b) ? (a):(b)) diff --git a/thirdparty/opus/celt/arch.h b/thirdparty/opus/celt/arch.h index 8ceab5fe1..8c22dab3d 100644 --- a/thirdparty/opus/celt/arch.h +++ b/thirdparty/opus/celt/arch.h @@ -1,3 +1,5 @@ +#ifndef ARCH_H +#define ARCH_H /* Copyright (c) 2003-2008 Jean-Marc Valin Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2009 Xiph.Org Foundation @@ -31,8 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ARCH_H -#define ARCH_H + + #include "opus_types.h" #include "opus_defines.h" diff --git a/thirdparty/opus/celt/arm/fixed_arm64.h b/thirdparty/opus/celt/arm/fixed_arm64.h index c6fbd3db2..14dca2c7f 100644 --- a/thirdparty/opus/celt/arm/fixed_arm64.h +++ b/thirdparty/opus/celt/arm/fixed_arm64.h @@ -1,3 +1,5 @@ +#ifndef FIXED_ARM64_H +#define FIXED_ARM64_H /* Copyright (C) 2015 Vidyo */ /* Redistribution and use in source and binary forms, with or without @@ -24,8 +26,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef FIXED_ARM64_H -#define FIXED_ARM64_H + + #include diff --git a/thirdparty/opus/celt/arm/fixed_armv4.h b/thirdparty/opus/celt/arm/fixed_armv4.h index efb3b1896..2ac6f180b 100644 --- a/thirdparty/opus/celt/arm/fixed_armv4.h +++ b/thirdparty/opus/celt/arm/fixed_armv4.h @@ -1,3 +1,5 @@ +#ifndef FIXED_ARMv4_H +#define FIXED_ARMv4_H /* Copyright (C) 2013 Xiph.Org Foundation and contributors */ /* Redistribution and use in source and binary forms, with or without @@ -24,8 +26,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef FIXED_ARMv4_H -#define FIXED_ARMv4_H + + /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */ #undef MULT16_32_Q16 diff --git a/thirdparty/opus/celt/arm/fixed_armv5e.h b/thirdparty/opus/celt/arm/fixed_armv5e.h index 36a632110..0105c2989 100644 --- a/thirdparty/opus/celt/arm/fixed_armv5e.h +++ b/thirdparty/opus/celt/arm/fixed_armv5e.h @@ -1,3 +1,5 @@ +#ifndef FIXED_ARMv5E_H +#define FIXED_ARMv5E_H /* Copyright (C) 2007-2009 Xiph.Org Foundation Copyright (C) 2003-2008 Jean-Marc Valin Copyright (C) 2007-2008 CSIRO @@ -27,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef FIXED_ARMv5E_H -#define FIXED_ARMv5E_H + + #include "fixed_armv4.h" diff --git a/thirdparty/opus/celt/arm/kiss_fft_armv4.h b/thirdparty/opus/celt/arm/kiss_fft_armv4.h index e4faad6f2..69d59e5c5 100644 --- a/thirdparty/opus/celt/arm/kiss_fft_armv4.h +++ b/thirdparty/opus/celt/arm/kiss_fft_armv4.h @@ -1,3 +1,5 @@ +#ifndef KISS_FFT_ARMv4_H +#define KISS_FFT_ARMv4_H /*Copyright (c) 2013, Xiph.Org Foundation and contributors. All rights reserved. @@ -23,8 +25,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ -#ifndef KISS_FFT_ARMv4_H -#define KISS_FFT_ARMv4_H + + #if !defined(KISS_FFT_GUTS_H) #error "This file should only be included from _kiss_fft_guts.h" diff --git a/thirdparty/opus/celt/arm/kiss_fft_armv5e.h b/thirdparty/opus/celt/arm/kiss_fft_armv5e.h index 9eca183d7..1078947d3 100644 --- a/thirdparty/opus/celt/arm/kiss_fft_armv5e.h +++ b/thirdparty/opus/celt/arm/kiss_fft_armv5e.h @@ -1,3 +1,5 @@ +#ifndef KISS_FFT_ARMv5E_H +#define KISS_FFT_ARMv5E_H /*Copyright (c) 2013, Xiph.Org Foundation and contributors. All rights reserved. @@ -23,8 +25,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ -#ifndef KISS_FFT_ARMv5E_H -#define KISS_FFT_ARMv5E_H + + #if !defined(KISS_FFT_GUTS_H) #error "This file should only be included from _kiss_fft_guts.h" diff --git a/thirdparty/opus/celt/bands.h b/thirdparty/opus/celt/bands.h index e8bef4bad..b468a64ba 100644 --- a/thirdparty/opus/celt/bands.h +++ b/thirdparty/opus/celt/bands.h @@ -1,3 +1,5 @@ +#ifndef BANDS_H +#define BANDS_H /* Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2009 Xiph.Org Foundation Copyright (c) 2008-2009 Gregory Maxwell @@ -27,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef BANDS_H -#define BANDS_H + + #include "arch.h" #include "modes.h" diff --git a/thirdparty/opus/celt/celt.h b/thirdparty/opus/celt/celt.h index d1f7eb690..39648bdae 100644 --- a/thirdparty/opus/celt/celt.h +++ b/thirdparty/opus/celt/celt.h @@ -1,3 +1,5 @@ +#ifndef CELT_H +#define CELT_H /* Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2009 Xiph.Org Foundation Copyright (c) 2008 Gregory Maxwell @@ -32,8 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CELT_H -#define CELT_H + + #include "opus_types.h" #include "opus_defines.h" diff --git a/thirdparty/opus/celt/celt_lpc.h b/thirdparty/opus/celt/celt_lpc.h index 323459eb1..b8f64bf68 100644 --- a/thirdparty/opus/celt/celt_lpc.h +++ b/thirdparty/opus/celt/celt_lpc.h @@ -1,3 +1,5 @@ +#ifndef PLC_H +#define PLC_H /* Copyright (c) 2009-2010 Xiph.Org Foundation Written by Jean-Marc Valin */ /* @@ -25,8 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PLC_H -#define PLC_H + + #include "arch.h" #include "cpu_support.h" diff --git a/thirdparty/opus/celt/cpu_support.h b/thirdparty/opus/celt/cpu_support.h index 68fc60678..5620d4ee4 100644 --- a/thirdparty/opus/celt/cpu_support.h +++ b/thirdparty/opus/celt/cpu_support.h @@ -1,3 +1,5 @@ +#ifndef CPU_SUPPORT_H +#define CPU_SUPPORT_H /* Copyright (c) 2010 Xiph.Org Foundation * Copyright (c) 2013 Parrot */ /* @@ -25,8 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CPU_SUPPORT_H -#define CPU_SUPPORT_H + + #include "opus_types.h" #include "opus_defines.h" diff --git a/thirdparty/opus/celt/cwrs.h b/thirdparty/opus/celt/cwrs.h index 7cd471745..ba0856471 100644 --- a/thirdparty/opus/celt/cwrs.h +++ b/thirdparty/opus/celt/cwrs.h @@ -1,3 +1,5 @@ +#ifndef CWRS_H +#define CWRS_H /* Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2009 Xiph.Org Foundation Copyright (c) 2007-2009 Timothy B. Terriberry @@ -27,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CWRS_H -#define CWRS_H + + #include "arch.h" #include "stack_alloc.h" diff --git a/thirdparty/opus/celt/fixed_debug.h b/thirdparty/opus/celt/fixed_debug.h index d28227f5d..adecf9db2 100644 --- a/thirdparty/opus/celt/fixed_debug.h +++ b/thirdparty/opus/celt/fixed_debug.h @@ -1,3 +1,5 @@ +#ifndef FIXED_DEBUG_H +#define FIXED_DEBUG_H /* Copyright (C) 2003-2008 Jean-Marc Valin Copyright (C) 2007-2012 Xiph.Org Foundation */ /** @@ -29,8 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef FIXED_DEBUG_H -#define FIXED_DEBUG_H + + #include #include "opus_defines.h" diff --git a/thirdparty/opus/celt/fixed_generic.h b/thirdparty/opus/celt/fixed_generic.h index 1cfd6d698..c34fee36e 100644 --- a/thirdparty/opus/celt/fixed_generic.h +++ b/thirdparty/opus/celt/fixed_generic.h @@ -1,3 +1,5 @@ +#ifndef FIXED_GENERIC_H +#define FIXED_GENERIC_H /* Copyright (C) 2007-2009 Xiph.Org Foundation Copyright (C) 2003-2008 Jean-Marc Valin Copyright (C) 2007-2008 CSIRO */ @@ -30,8 +32,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef FIXED_GENERIC_H -#define FIXED_GENERIC_H + + /** Multiply a 16-bit signed value by a 16-bit unsigned value. The result is a 32-bit signed value */ #define MULT16_16SU(a,b) ((opus_val32)(opus_val16)(a)*(opus_val32)(opus_uint16)(b)) diff --git a/thirdparty/opus/celt/float_cast.h b/thirdparty/opus/celt/float_cast.h index ed5a39b54..744705e88 100644 --- a/thirdparty/opus/celt/float_cast.h +++ b/thirdparty/opus/celt/float_cast.h @@ -1,3 +1,5 @@ +#ifndef FLOAT_CAST_H +#define FLOAT_CAST_H /* Copyright (C) 2001 Erik de Castro Lopo */ /* Redistribution and use in source and binary forms, with or without @@ -26,8 +28,8 @@ /* Version 1.1 */ -#ifndef FLOAT_CAST_H -#define FLOAT_CAST_H + + #include "arch.h" diff --git a/thirdparty/opus/celt/kiss_fft.h b/thirdparty/opus/celt/kiss_fft.h index bffa2bfad..d3e8bcd52 100644 --- a/thirdparty/opus/celt/kiss_fft.h +++ b/thirdparty/opus/celt/kiss_fft.h @@ -1,3 +1,5 @@ +#ifndef KISS_FFT_H +#define KISS_FFT_H /*Copyright (c) 2003-2004, Mark Borgerding Lots of modifications by Jean-Marc Valin Copyright (c) 2005-2007, Xiph.Org Foundation @@ -26,8 +28,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ -#ifndef KISS_FFT_H -#define KISS_FFT_H + + #include #include diff --git a/thirdparty/opus/celt/mathops.h b/thirdparty/opus/celt/mathops.h index a0525a961..36936c004 100644 --- a/thirdparty/opus/celt/mathops.h +++ b/thirdparty/opus/celt/mathops.h @@ -1,3 +1,5 @@ +#ifndef MATHOPS_H +#define MATHOPS_H /* Copyright (c) 2002-2008 Jean-Marc Valin Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2009 Xiph.Org Foundation @@ -31,8 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MATHOPS_H -#define MATHOPS_H + + #include "arch.h" #include "entcode.h" diff --git a/thirdparty/opus/celt/mdct.h b/thirdparty/opus/celt/mdct.h index 160ae4e0f..b84b27f81 100644 --- a/thirdparty/opus/celt/mdct.h +++ b/thirdparty/opus/celt/mdct.h @@ -1,3 +1,5 @@ +#ifndef MDCT_H +#define MDCT_H /* Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2008 Xiph.Org Foundation Written by Jean-Marc Valin */ @@ -39,8 +41,8 @@ and scaling in many places. */ -#ifndef MDCT_H -#define MDCT_H + + #include "opus_defines.h" #include "kiss_fft.h" diff --git a/thirdparty/opus/celt/mips/celt_mipsr1.h b/thirdparty/opus/celt/mips/celt_mipsr1.h index e85661a66..80344d92c 100644 --- a/thirdparty/opus/celt/mips/celt_mipsr1.h +++ b/thirdparty/opus/celt/mips/celt_mipsr1.h @@ -1,3 +1,5 @@ +#ifndef __CELT_MIPSR1_H__ +#define __CELT_MIPSR1_H__ /* Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2010 Xiph.Org Foundation Copyright (c) 2008 Gregory Maxwell @@ -27,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __CELT_MIPSR1_H__ -#define __CELT_MIPSR1_H__ + + #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/thirdparty/opus/celt/mips/fixed_generic_mipsr1.h b/thirdparty/opus/celt/mips/fixed_generic_mipsr1.h index 4a05efbf8..4c0f595d8 100644 --- a/thirdparty/opus/celt/mips/fixed_generic_mipsr1.h +++ b/thirdparty/opus/celt/mips/fixed_generic_mipsr1.h @@ -1,3 +1,5 @@ +#ifndef CELT_FIXED_GENERIC_MIPSR1_H +#define CELT_FIXED_GENERIC_MIPSR1_H /* Copyright (C) 2007-2009 Xiph.Org Foundation Copyright (C) 2003-2008 Jean-Marc Valin Copyright (C) 2007-2008 CSIRO */ @@ -30,8 +32,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CELT_FIXED_GENERIC_MIPSR1_H -#define CELT_FIXED_GENERIC_MIPSR1_H + + #undef MULT16_32_Q15_ADD static inline int MULT16_32_Q15_ADD(int a, int b, int c, int d) { diff --git a/thirdparty/opus/celt/mips/kiss_fft_mipsr1.h b/thirdparty/opus/celt/mips/kiss_fft_mipsr1.h index 400ca4de9..2ccf0b46d 100644 --- a/thirdparty/opus/celt/mips/kiss_fft_mipsr1.h +++ b/thirdparty/opus/celt/mips/kiss_fft_mipsr1.h @@ -1,3 +1,5 @@ +#ifndef KISS_FFT_MIPSR1_H +#define KISS_FFT_MIPSR1_H /*Copyright (c) 2013, Xiph.Org Foundation and contributors. All rights reserved. @@ -23,8 +25,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ -#ifndef KISS_FFT_MIPSR1_H -#define KISS_FFT_MIPSR1_H + + #if !defined(KISS_FFT_GUTS_H) #error "This file should only be included from _kiss_fft_guts.h" diff --git a/thirdparty/opus/celt/mips/mdct_mipsr1.h b/thirdparty/opus/celt/mips/mdct_mipsr1.h index 2934dab77..e7fa365fe 100644 --- a/thirdparty/opus/celt/mips/mdct_mipsr1.h +++ b/thirdparty/opus/celt/mips/mdct_mipsr1.h @@ -1,3 +1,5 @@ +#ifndef __MDCT_MIPSR1_H__ +#define __MDCT_MIPSR1_H__ /* Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2008 Xiph.Org Foundation Written by Jean-Marc Valin */ @@ -38,8 +40,8 @@ MDCT implementation in FFMPEG, but has differences in signs, ordering and scaling in many places. */ -#ifndef __MDCT_MIPSR1_H__ -#define __MDCT_MIPSR1_H__ + + #ifndef SKIP_CONFIG_H #ifdef HAVE_CONFIG_H diff --git a/thirdparty/opus/celt/mips/pitch_mipsr1.h b/thirdparty/opus/celt/mips/pitch_mipsr1.h index a9500aff5..a96d82dbe 100644 --- a/thirdparty/opus/celt/mips/pitch_mipsr1.h +++ b/thirdparty/opus/celt/mips/pitch_mipsr1.h @@ -1,3 +1,5 @@ +#ifndef PITCH_MIPSR1_H +#define PITCH_MIPSR1_H /* Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2009 Xiph.Org Foundation Written by Jean-Marc Valin */ @@ -31,8 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PITCH_MIPSR1_H -#define PITCH_MIPSR1_H + + #define OVERRIDE_DUAL_INNER_PROD static inline void dual_inner_prod(const opus_val16 *x, const opus_val16 *y01, const opus_val16 *y02, diff --git a/thirdparty/opus/celt/mips/vq_mipsr1.h b/thirdparty/opus/celt/mips/vq_mipsr1.h index 54cef8613..1e62858b4 100644 --- a/thirdparty/opus/celt/mips/vq_mipsr1.h +++ b/thirdparty/opus/celt/mips/vq_mipsr1.h @@ -1,3 +1,5 @@ +#ifndef __VQ_MIPSR1_H__ +#define __VQ_MIPSR1_H__ /* Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2009 Xiph.Org Foundation Written by Jean-Marc Valin */ @@ -26,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __VQ_MIPSR1_H__ -#define __VQ_MIPSR1_H__ + + #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/thirdparty/opus/celt/modes.h b/thirdparty/opus/celt/modes.h index be813ccc8..b3b2109bc 100644 --- a/thirdparty/opus/celt/modes.h +++ b/thirdparty/opus/celt/modes.h @@ -1,3 +1,5 @@ +#ifndef MODES_H +#define MODES_H /* Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2009 Xiph.Org Foundation Copyright (c) 2008 Gregory Maxwell @@ -27,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MODES_H -#define MODES_H + + #include "opus_types.h" #include "celt.h" diff --git a/thirdparty/opus/celt/os_support.h b/thirdparty/opus/celt/os_support.h index a2171971e..679f2371c 100644 --- a/thirdparty/opus/celt/os_support.h +++ b/thirdparty/opus/celt/os_support.h @@ -1,3 +1,5 @@ +#ifndef OS_SUPPORT_H +#define OS_SUPPORT_H /* Copyright (C) 2007 Jean-Marc Valin File: os_support.h @@ -28,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#ifndef OS_SUPPORT_H -#define OS_SUPPORT_H + + #ifdef CUSTOM_SUPPORT # include "custom_support.h" diff --git a/thirdparty/opus/celt/pitch.h b/thirdparty/opus/celt/pitch.h index d3503532a..325faa41f 100644 --- a/thirdparty/opus/celt/pitch.h +++ b/thirdparty/opus/celt/pitch.h @@ -1,3 +1,5 @@ +#ifndef PITCH_H +#define PITCH_H /* Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2009 Xiph.Org Foundation Written by Jean-Marc Valin */ @@ -31,8 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PITCH_H -#define PITCH_H + + #include "modes.h" #include "cpu_support.h" diff --git a/thirdparty/opus/celt/quant_bands.h b/thirdparty/opus/celt/quant_bands.h index 0490bca4b..e9138942b 100644 --- a/thirdparty/opus/celt/quant_bands.h +++ b/thirdparty/opus/celt/quant_bands.h @@ -1,3 +1,5 @@ +#ifndef QUANT_BANDS +#define QUANT_BANDS /* Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2009 Xiph.Org Foundation Written by Jean-Marc Valin */ @@ -26,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef QUANT_BANDS -#define QUANT_BANDS + + #include "arch.h" #include "modes.h" diff --git a/thirdparty/opus/celt/rate.h b/thirdparty/opus/celt/rate.h index 515f7687c..f90d95083 100644 --- a/thirdparty/opus/celt/rate.h +++ b/thirdparty/opus/celt/rate.h @@ -1,3 +1,5 @@ +#ifndef RATE_H +#define RATE_H /* Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2009 Xiph.Org Foundation Written by Jean-Marc Valin */ @@ -26,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef RATE_H -#define RATE_H + + #define MAX_PSEUDO 40 #define LOG_MAX_PSEUDO 6 diff --git a/thirdparty/opus/celt/stack_alloc.h b/thirdparty/opus/celt/stack_alloc.h index 2b51c8d80..956155875 100644 --- a/thirdparty/opus/celt/stack_alloc.h +++ b/thirdparty/opus/celt/stack_alloc.h @@ -1,3 +1,5 @@ +#ifndef STACK_ALLOC_H +#define STACK_ALLOC_H /* Copyright (C) 2002-2003 Jean-Marc Valin Copyright (C) 2007-2009 Xiph.Org Foundation */ /** @@ -29,8 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef STACK_ALLOC_H -#define STACK_ALLOC_H + + #include "opus_types.h" #include "opus_defines.h" diff --git a/thirdparty/opus/celt/static_modes_fixed.h b/thirdparty/opus/celt/static_modes_fixed.h index 8717d626c..3a0fe7ec2 100644 --- a/thirdparty/opus/celt/static_modes_fixed.h +++ b/thirdparty/opus/celt/static_modes_fixed.h @@ -1,3 +1,5 @@ +#ifndef DEF_WINDOW120 +#define DEF_WINDOW120 /* The contents of this file was automatically generated by dump_modes.c with arguments: 48000 960 It contains static definitions for some pre-defined modes. */ @@ -9,8 +11,8 @@ #include "static_modes_fixed_arm_ne10.h" #endif -#ifndef DEF_WINDOW120 -#define DEF_WINDOW120 + + static const opus_val16 window120[120] = { 2, 20, 55, 108, 178, 266, 372, 494, 635, 792, diff --git a/thirdparty/opus/celt/static_modes_fixed_arm_ne10.h b/thirdparty/opus/celt/static_modes_fixed_arm_ne10.h index b8ef0cee9..b1bcef1ef 100644 --- a/thirdparty/opus/celt/static_modes_fixed_arm_ne10.h +++ b/thirdparty/opus/celt/static_modes_fixed_arm_ne10.h @@ -1,10 +1,12 @@ +#ifndef NE10_FFT_PARAMS48000_960 +#define NE10_FFT_PARAMS48000_960 /* The contents of this file was automatically generated by * dump_mode_arm_ne10.c with arguments: 48000 960 * It contains static definitions for some pre-defined modes. */ #include -#ifndef NE10_FFT_PARAMS48000_960 -#define NE10_FFT_PARAMS48000_960 + + static const ne10_int32_t ne10_factors_480[64] = { 4, 40, 4, 30, 2, 15, 5, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/thirdparty/opus/celt/static_modes_float.h b/thirdparty/opus/celt/static_modes_float.h index e102a3839..b5cf842a9 100644 --- a/thirdparty/opus/celt/static_modes_float.h +++ b/thirdparty/opus/celt/static_modes_float.h @@ -1,3 +1,5 @@ +#ifndef DEF_WINDOW120 +#define DEF_WINDOW120 /* The contents of this file was automatically generated by dump_modes.c with arguments: 48000 960 It contains static definitions for some pre-defined modes. */ @@ -9,8 +11,8 @@ #include "static_modes_float_arm_ne10.h" #endif -#ifndef DEF_WINDOW120 -#define DEF_WINDOW120 + + static const opus_val16 window120[120] = { 6.7286966e-05f, 0.00060551348f, 0.0016815970f, 0.0032947962f, 0.0054439943f, 0.0081276923f, 0.011344001f, 0.015090633f, 0.019364886f, 0.024163635f, diff --git a/thirdparty/opus/celt/static_modes_float_arm_ne10.h b/thirdparty/opus/celt/static_modes_float_arm_ne10.h index 934a82a42..1c35301c8 100644 --- a/thirdparty/opus/celt/static_modes_float_arm_ne10.h +++ b/thirdparty/opus/celt/static_modes_float_arm_ne10.h @@ -1,10 +1,12 @@ +#ifndef NE10_FFT_PARAMS48000_960 +#define NE10_FFT_PARAMS48000_960 /* The contents of this file was automatically generated by * dump_mode_arm_ne10.c with arguments: 48000 960 * It contains static definitions for some pre-defined modes. */ #include -#ifndef NE10_FFT_PARAMS48000_960 -#define NE10_FFT_PARAMS48000_960 + + static const ne10_int32_t ne10_factors_480[64] = { 4, 40, 4, 30, 2, 15, 5, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/thirdparty/opus/celt/vq.h b/thirdparty/opus/celt/vq.h index 5cfcbe50e..8b8578f9a 100644 --- a/thirdparty/opus/celt/vq.h +++ b/thirdparty/opus/celt/vq.h @@ -1,3 +1,5 @@ +#ifndef VQ_H +#define VQ_H /* Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2009 Xiph.Org Foundation Written by Jean-Marc Valin */ @@ -30,8 +32,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef VQ_H -#define VQ_H + + #include "entenc.h" #include "entdec.h" diff --git a/thirdparty/opus/celt/x86/celt_lpc_sse.h b/thirdparty/opus/celt/x86/celt_lpc_sse.h index c5ec796ed..93d27f11e 100644 --- a/thirdparty/opus/celt/x86/celt_lpc_sse.h +++ b/thirdparty/opus/celt/x86/celt_lpc_sse.h @@ -1,3 +1,5 @@ +#ifndef CELT_LPC_SSE_H +#define CELT_LPC_SSE_H /* Copyright (c) 2014, Cisco Systems, INC Written by XiangMingZhu WeiZhou MinPeng YanWang @@ -25,8 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CELT_LPC_SSE_H -#define CELT_LPC_SSE_H + + #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/thirdparty/opus/celt/x86/pitch_sse.h b/thirdparty/opus/celt/x86/pitch_sse.h index e5f87ab51..59ab17588 100644 --- a/thirdparty/opus/celt/x86/pitch_sse.h +++ b/thirdparty/opus/celt/x86/pitch_sse.h @@ -1,3 +1,5 @@ +#ifndef PITCH_SSE_H +#define PITCH_SSE_H /* Copyright (c) 2013 Jean-Marc Valin and John Ridges Copyright (c) 2014, Cisco Systems, INC MingXiang WeiZhou MinPeng YanWang*/ /** @@ -30,8 +32,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PITCH_SSE_H -#define PITCH_SSE_H + + #if defined(HAVE_CONFIG_H) #include "config.h" diff --git a/thirdparty/opus/config.h b/thirdparty/opus/config.h index 7b9c92c6a..d7771ba2d 100644 --- a/thirdparty/opus/config.h +++ b/thirdparty/opus/config.h @@ -1,3 +1,5 @@ +#ifndef WIN32 + #define VAR_ARRAYS 1 /* Opus configuration header */ /* Based on the output of libopus configure script */ @@ -95,9 +97,9 @@ /* This is a build of OPUS */ #define OPUS_BUILD /**/ -#ifndef WIN32 + /* Use C99 variable-size arrays */ - #define VAR_ARRAYS 1 + #else /* Fixes VS 2013 compile error */ #define USE_ALLOCA 1 diff --git a/thirdparty/opus/mlp.h b/thirdparty/opus/mlp.h index 618e246e2..56bf1d872 100644 --- a/thirdparty/opus/mlp.h +++ b/thirdparty/opus/mlp.h @@ -1,3 +1,5 @@ +#ifndef _MLP_H_ +#define _MLP_H_ /* Copyright (c) 2008-2011 Octasic Inc. Written by Jean-Marc Valin */ /* @@ -25,8 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MLP_H_ -#define _MLP_H_ + + #include "arch.h" diff --git a/thirdparty/opus/opus/opus.h b/thirdparty/opus/opus/opus.h index 5be73ddf4..c7705b260 100644 --- a/thirdparty/opus/opus/opus.h +++ b/thirdparty/opus/opus/opus.h @@ -1,3 +1,5 @@ +#ifndef OPUS_H +#define OPUS_H /* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited Written by Jean-Marc Valin and Koen Vos */ /* @@ -30,8 +32,8 @@ * @brief Opus reference implementation API */ -#ifndef OPUS_H -#define OPUS_H + + #include "opus_types.h" #include "opus_defines.h" diff --git a/thirdparty/opus/opus/opus_custom.h b/thirdparty/opus/opus/opus_custom.h index 41f36bf2f..763551bde 100644 --- a/thirdparty/opus/opus/opus_custom.h +++ b/thirdparty/opus/opus/opus_custom.h @@ -1,3 +1,5 @@ +#ifndef OPUS_CUSTOM_H +#define OPUS_CUSTOM_H /* Copyright (c) 2007-2008 CSIRO Copyright (c) 2007-2009 Xiph.Org Foundation Copyright (c) 2008-2012 Gregory Maxwell @@ -32,8 +34,8 @@ @brief Opus-Custom reference implementation API */ -#ifndef OPUS_CUSTOM_H -#define OPUS_CUSTOM_H + + #include "opus_defines.h" diff --git a/thirdparty/opus/opus/opus_defines.h b/thirdparty/opus/opus/opus_defines.h index 315412dd1..bf16517b0 100644 --- a/thirdparty/opus/opus/opus_defines.h +++ b/thirdparty/opus/opus/opus_defines.h @@ -1,3 +1,5 @@ +#ifndef OPUS_DEFINES_H +#define OPUS_DEFINES_H /* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited Written by Jean-Marc Valin and Koen Vos */ /* @@ -30,8 +32,8 @@ * @brief Opus reference implementation constants */ -#ifndef OPUS_DEFINES_H -#define OPUS_DEFINES_H + + #include "opus_types.h" diff --git a/thirdparty/opus/opus/opus_multistream.h b/thirdparty/opus/opus/opus_multistream.h index 3622e009f..fc965f43e 100644 --- a/thirdparty/opus/opus/opus_multistream.h +++ b/thirdparty/opus/opus/opus_multistream.h @@ -1,3 +1,5 @@ +#ifndef OPUS_MULTISTREAM_H +#define OPUS_MULTISTREAM_H /* Copyright (c) 2011 Xiph.Org Foundation Written by Jean-Marc Valin */ /* @@ -30,8 +32,8 @@ * @brief Opus reference implementation multistream API */ -#ifndef OPUS_MULTISTREAM_H -#define OPUS_MULTISTREAM_H + + #include "opus.h" diff --git a/thirdparty/opus/opus/opus_types.h b/thirdparty/opus/opus/opus_types.h index b28e03aea..d0bc5c2a9 100644 --- a/thirdparty/opus/opus/opus_types.h +++ b/thirdparty/opus/opus/opus_types.h @@ -1,3 +1,5 @@ +#ifndef OPUS_TYPES_H +#define OPUS_TYPES_H /* (C) COPYRIGHT 1994-2002 Xiph.Org Foundation */ /* Modified by Jean-Marc Valin */ /* @@ -30,8 +32,8 @@ @file opus_types.h @brief Opus reference implementation types */ -#ifndef OPUS_TYPES_H -#define OPUS_TYPES_H + + /* Use the real stdint.h if it's there (taken from Paul Hsieh's pstdint.h) */ #if (defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HAVE_STDINT_H)) diff --git a/thirdparty/opus/opus_private.h b/thirdparty/opus/opus_private.h index 3b62eed09..9e800f994 100644 --- a/thirdparty/opus/opus_private.h +++ b/thirdparty/opus/opus_private.h @@ -1,3 +1,5 @@ +#ifndef OPUS_PRIVATE_H +#define OPUS_PRIVATE_H /* Copyright (c) 2012 Xiph.Org Foundation Written by Jean-Marc Valin */ /* @@ -26,8 +28,8 @@ */ -#ifndef OPUS_PRIVATE_H -#define OPUS_PRIVATE_H + + #include "arch.h" #include "opus.h" diff --git a/thirdparty/opus/silk/API.h b/thirdparty/opus/silk/API.h index 0131acbb0..9c6aa3c44 100644 --- a/thirdparty/opus/silk/API.h +++ b/thirdparty/opus/silk/API.h @@ -1,3 +1,5 @@ +#ifndef SILK_API_H +#define SILK_API_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_API_H -#define SILK_API_H + + #include "control.h" #include "typedef.h" diff --git a/thirdparty/opus/silk/Inlines.h b/thirdparty/opus/silk/Inlines.h index ec986cdfd..a5b3dea03 100644 --- a/thirdparty/opus/silk/Inlines.h +++ b/thirdparty/opus/silk/Inlines.h @@ -1,3 +1,5 @@ +#ifndef SILK_FIX_INLINES_H +#define SILK_FIX_INLINES_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -29,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE. * \brief silk_Inlines.h defines OPUS_INLINE signal processing functions. */ -#ifndef SILK_FIX_INLINES_H -#define SILK_FIX_INLINES_H + + #ifdef __cplusplus extern "C" diff --git a/thirdparty/opus/silk/MacroCount.h b/thirdparty/opus/silk/MacroCount.h index 834817d05..852456459 100644 --- a/thirdparty/opus/silk/MacroCount.h +++ b/thirdparty/opus/silk/MacroCount.h @@ -1,3 +1,5 @@ +#ifndef SIGPROCFIX_API_MACROCOUNT_H +#define SIGPROCFIX_API_MACROCOUNT_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SIGPROCFIX_API_MACROCOUNT_H -#define SIGPROCFIX_API_MACROCOUNT_H + + #include #ifdef silk_MACRO_COUNT diff --git a/thirdparty/opus/silk/MacroDebug.h b/thirdparty/opus/silk/MacroDebug.h index 35aedc5c5..3a5707bf5 100644 --- a/thirdparty/opus/silk/MacroDebug.h +++ b/thirdparty/opus/silk/MacroDebug.h @@ -1,3 +1,5 @@ +#ifndef MACRO_DEBUG_H +#define MACRO_DEBUG_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Copyright (C) 2012 Xiph.Org Foundation @@ -26,8 +28,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef MACRO_DEBUG_H -#define MACRO_DEBUG_H + + /* Redefine macro functions with extensive assertion in DEBUG mode. As functions can't be undefined, this file can't work with SigProcFIX_MacroCount.h */ diff --git a/thirdparty/opus/silk/NSQ.h b/thirdparty/opus/silk/NSQ.h index 971832f66..fef3920ce 100644 --- a/thirdparty/opus/silk/NSQ.h +++ b/thirdparty/opus/silk/NSQ.h @@ -1,3 +1,5 @@ +#ifndef SILK_NSQ_H +#define SILK_NSQ_H /*********************************************************************** Copyright (c) 2014 Vidyo. Copyright (c) 2006-2011, Skype Limited. All rights reserved. @@ -25,8 +27,8 @@ 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. ***********************************************************************/ -#ifndef SILK_NSQ_H -#define SILK_NSQ_H + + #include "SigProc_FIX.h" diff --git a/thirdparty/opus/silk/PLC.h b/thirdparty/opus/silk/PLC.h index 6438f5163..636756187 100644 --- a/thirdparty/opus/silk/PLC.h +++ b/thirdparty/opus/silk/PLC.h @@ -1,3 +1,5 @@ +#ifndef SILK_PLC_H +#define SILK_PLC_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_PLC_H -#define SILK_PLC_H + + #include "main.h" diff --git a/thirdparty/opus/silk/SigProc_FIX.h b/thirdparty/opus/silk/SigProc_FIX.h index b63299441..741768f44 100644 --- a/thirdparty/opus/silk/SigProc_FIX.h +++ b/thirdparty/opus/silk/SigProc_FIX.h @@ -1,3 +1,5 @@ +#ifndef SILK_SIGPROC_FIX_H +#define SILK_SIGPROC_FIX_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_SIGPROC_FIX_H -#define SILK_SIGPROC_FIX_H + + #ifdef __cplusplus extern "C" diff --git a/thirdparty/opus/silk/arm/NSQ_neon.h b/thirdparty/opus/silk/arm/NSQ_neon.h index 77c946af8..74ef88fdb 100644 --- a/thirdparty/opus/silk/arm/NSQ_neon.h +++ b/thirdparty/opus/silk/arm/NSQ_neon.h @@ -1,3 +1,5 @@ +#ifndef SILK_NSQ_NEON_H +#define SILK_NSQ_NEON_H /*********************************************************************** Copyright (C) 2014 Vidyo Redistribution and use in source and binary forms, with or without @@ -24,8 +26,8 @@ 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. ***********************************************************************/ -#ifndef SILK_NSQ_NEON_H -#define SILK_NSQ_NEON_H + + #include "cpu_support.h" diff --git a/thirdparty/opus/silk/arm/SigProc_FIX_armv4.h b/thirdparty/opus/silk/arm/SigProc_FIX_armv4.h index ff62b1e5d..fd23cae2f 100644 --- a/thirdparty/opus/silk/arm/SigProc_FIX_armv4.h +++ b/thirdparty/opus/silk/arm/SigProc_FIX_armv4.h @@ -1,3 +1,5 @@ +#ifndef SILK_SIGPROC_FIX_ARMv4_H +#define SILK_SIGPROC_FIX_ARMv4_H /*********************************************************************** Copyright (C) 2013 Xiph.Org Foundation and contributors Copyright (c) 2013 Parrot @@ -26,8 +28,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_SIGPROC_FIX_ARMv4_H -#define SILK_SIGPROC_FIX_ARMv4_H + + #undef silk_MLA static OPUS_INLINE opus_int32 silk_MLA_armv4(opus_int32 a, opus_int32 b, diff --git a/thirdparty/opus/silk/arm/SigProc_FIX_armv5e.h b/thirdparty/opus/silk/arm/SigProc_FIX_armv5e.h index 617a09cab..94ac99c71 100644 --- a/thirdparty/opus/silk/arm/SigProc_FIX_armv5e.h +++ b/thirdparty/opus/silk/arm/SigProc_FIX_armv5e.h @@ -1,3 +1,5 @@ +#ifndef SILK_SIGPROC_FIX_ARMv5E_H +#define SILK_SIGPROC_FIX_ARMv5E_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Copyright (c) 2013 Parrot @@ -26,8 +28,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_SIGPROC_FIX_ARMv5E_H -#define SILK_SIGPROC_FIX_ARMv5E_H + + #undef silk_SMULTT static OPUS_INLINE opus_int32 silk_SMULTT_armv5e(opus_int32 a, opus_int32 b) diff --git a/thirdparty/opus/silk/arm/macros_arm64.h b/thirdparty/opus/silk/arm/macros_arm64.h index ed030413c..c7807c202 100644 --- a/thirdparty/opus/silk/arm/macros_arm64.h +++ b/thirdparty/opus/silk/arm/macros_arm64.h @@ -1,3 +1,5 @@ +#ifndef SILK_MACROS_ARM64_H +#define SILK_MACROS_ARM64_H /*********************************************************************** Copyright (C) 2015 Vidyo Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_MACROS_ARM64_H -#define SILK_MACROS_ARM64_H + + #include diff --git a/thirdparty/opus/silk/arm/macros_armv4.h b/thirdparty/opus/silk/arm/macros_armv4.h index 3f30e9728..56b855d7f 100644 --- a/thirdparty/opus/silk/arm/macros_armv4.h +++ b/thirdparty/opus/silk/arm/macros_armv4.h @@ -1,3 +1,5 @@ +#ifndef SILK_MACROS_ARMv4_H +#define SILK_MACROS_ARMv4_H /*********************************************************************** Copyright (C) 2013 Xiph.Org Foundation and contributors. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_MACROS_ARMv4_H -#define SILK_MACROS_ARMv4_H + + /* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */ #undef silk_SMULWB diff --git a/thirdparty/opus/silk/arm/macros_armv5e.h b/thirdparty/opus/silk/arm/macros_armv5e.h index aad4117e4..8ed61186b 100644 --- a/thirdparty/opus/silk/arm/macros_armv5e.h +++ b/thirdparty/opus/silk/arm/macros_armv5e.h @@ -1,3 +1,5 @@ +#ifndef SILK_MACROS_ARMv5E_H +#define SILK_MACROS_ARMv5E_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Copyright (c) 2013 Parrot @@ -26,8 +28,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_MACROS_ARMv5E_H -#define SILK_MACROS_ARMv5E_H + + /* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */ #undef silk_SMULWB diff --git a/thirdparty/opus/silk/control.h b/thirdparty/opus/silk/control.h index 747e5426a..0ea0ab808 100644 --- a/thirdparty/opus/silk/control.h +++ b/thirdparty/opus/silk/control.h @@ -1,3 +1,5 @@ +#ifndef SILK_CONTROL_H +#define SILK_CONTROL_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_CONTROL_H -#define SILK_CONTROL_H + + #include "typedef.h" diff --git a/thirdparty/opus/silk/debug.h b/thirdparty/opus/silk/debug.h index efb6d3e99..22c6158c1 100644 --- a/thirdparty/opus/silk/debug.h +++ b/thirdparty/opus/silk/debug.h @@ -1,3 +1,5 @@ +#ifndef SILK_DEBUG_H +#define SILK_DEBUG_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_DEBUG_H -#define SILK_DEBUG_H + + #include "typedef.h" #include /* file writing */ diff --git a/thirdparty/opus/silk/define.h b/thirdparty/opus/silk/define.h index 19c9b00e2..79479b65d 100644 --- a/thirdparty/opus/silk/define.h +++ b/thirdparty/opus/silk/define.h @@ -1,3 +1,5 @@ +#ifndef SILK_DEFINE_H +#define SILK_DEFINE_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_DEFINE_H -#define SILK_DEFINE_H + + #include "errors.h" #include "typedef.h" diff --git a/thirdparty/opus/silk/errors.h b/thirdparty/opus/silk/errors.h index 45070800f..557b03e8b 100644 --- a/thirdparty/opus/silk/errors.h +++ b/thirdparty/opus/silk/errors.h @@ -1,3 +1,5 @@ +#ifndef SILK_ERRORS_H +#define SILK_ERRORS_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_ERRORS_H -#define SILK_ERRORS_H + + #ifdef __cplusplus extern "C" diff --git a/thirdparty/opus/silk/fixed/main_FIX.h b/thirdparty/opus/silk/fixed/main_FIX.h index 375b5eb32..ce6bf0f3c 100644 --- a/thirdparty/opus/silk/fixed/main_FIX.h +++ b/thirdparty/opus/silk/fixed/main_FIX.h @@ -1,3 +1,5 @@ +#ifndef SILK_MAIN_FIX_H +#define SILK_MAIN_FIX_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_MAIN_FIX_H -#define SILK_MAIN_FIX_H + + #include "SigProc_FIX.h" #include "structs_FIX.h" diff --git a/thirdparty/opus/silk/fixed/mips/prefilter_FIX_mipsr1.h b/thirdparty/opus/silk/fixed/mips/prefilter_FIX_mipsr1.h index 21b256885..efc9c76f2 100644 --- a/thirdparty/opus/silk/fixed/mips/prefilter_FIX_mipsr1.h +++ b/thirdparty/opus/silk/fixed/mips/prefilter_FIX_mipsr1.h @@ -1,3 +1,5 @@ +#ifndef __PREFILTER_FIX_MIPSR1_H__ +#define __PREFILTER_FIX_MIPSR1_H__ /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -24,8 +26,8 @@ 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. ***********************************************************************/ -#ifndef __PREFILTER_FIX_MIPSR1_H__ -#define __PREFILTER_FIX_MIPSR1_H__ + + #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/thirdparty/opus/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h b/thirdparty/opus/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h index e803ef0fc..1048cb016 100644 --- a/thirdparty/opus/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h +++ b/thirdparty/opus/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h @@ -1,3 +1,5 @@ +#ifndef __WARPED_AUTOCORRELATION_FIX_MIPSR1_H__ +#define __WARPED_AUTOCORRELATION_FIX_MIPSR1_H__ /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef __WARPED_AUTOCORRELATION_FIX_MIPSR1_H__ -#define __WARPED_AUTOCORRELATION_FIX_MIPSR1_H__ + + #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/thirdparty/opus/silk/fixed/structs_FIX.h b/thirdparty/opus/silk/fixed/structs_FIX.h index 3294b2512..6914b3f5c 100644 --- a/thirdparty/opus/silk/fixed/structs_FIX.h +++ b/thirdparty/opus/silk/fixed/structs_FIX.h @@ -1,3 +1,5 @@ +#ifndef SILK_STRUCTS_FIX_H +#define SILK_STRUCTS_FIX_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_STRUCTS_FIX_H -#define SILK_STRUCTS_FIX_H + + #include "typedef.h" #include "main.h" diff --git a/thirdparty/opus/silk/float/SigProc_FLP.h b/thirdparty/opus/silk/float/SigProc_FLP.h index f0cb3733b..1b749f477 100644 --- a/thirdparty/opus/silk/float/SigProc_FLP.h +++ b/thirdparty/opus/silk/float/SigProc_FLP.h @@ -1,3 +1,5 @@ +#ifndef SILK_SIGPROC_FLP_H +#define SILK_SIGPROC_FLP_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_SIGPROC_FLP_H -#define SILK_SIGPROC_FLP_H + + #include "SigProc_FIX.h" #include "float_cast.h" diff --git a/thirdparty/opus/silk/float/main_FLP.h b/thirdparty/opus/silk/float/main_FLP.h index e5a75972e..21a18adfa 100644 --- a/thirdparty/opus/silk/float/main_FLP.h +++ b/thirdparty/opus/silk/float/main_FLP.h @@ -1,3 +1,5 @@ +#ifndef SILK_MAIN_FLP_H +#define SILK_MAIN_FLP_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_MAIN_FLP_H -#define SILK_MAIN_FLP_H + + #include "SigProc_FLP.h" #include "SigProc_FIX.h" diff --git a/thirdparty/opus/silk/float/structs_FLP.h b/thirdparty/opus/silk/float/structs_FLP.h index 14d647ced..5dded2dfa 100644 --- a/thirdparty/opus/silk/float/structs_FLP.h +++ b/thirdparty/opus/silk/float/structs_FLP.h @@ -1,3 +1,5 @@ +#ifndef SILK_STRUCTS_FLP_H +#define SILK_STRUCTS_FLP_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_STRUCTS_FLP_H -#define SILK_STRUCTS_FLP_H + + #include "typedef.h" #include "main.h" diff --git a/thirdparty/opus/silk/macros.h b/thirdparty/opus/silk/macros.h index d3ca34752..8e3f19941 100644 --- a/thirdparty/opus/silk/macros.h +++ b/thirdparty/opus/silk/macros.h @@ -1,3 +1,5 @@ +#ifndef SILK_MACROS_H +#define SILK_MACROS_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_MACROS_H -#define SILK_MACROS_H + + #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/thirdparty/opus/silk/main.h b/thirdparty/opus/silk/main.h index 2f90d68f7..37a3b7375 100644 --- a/thirdparty/opus/silk/main.h +++ b/thirdparty/opus/silk/main.h @@ -1,3 +1,5 @@ +#ifndef SILK_MAIN_H +#define SILK_MAIN_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_MAIN_H -#define SILK_MAIN_H + + #include "SigProc_FIX.h" #include "define.h" diff --git a/thirdparty/opus/silk/mips/NSQ_del_dec_mipsr1.h b/thirdparty/opus/silk/mips/NSQ_del_dec_mipsr1.h index ad1cfe2a9..d58cfc861 100644 --- a/thirdparty/opus/silk/mips/NSQ_del_dec_mipsr1.h +++ b/thirdparty/opus/silk/mips/NSQ_del_dec_mipsr1.h @@ -1,3 +1,5 @@ +#ifndef __NSQ_DEL_DEC_MIPSR1_H__ +#define __NSQ_DEL_DEC_MIPSR1_H__ /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef __NSQ_DEL_DEC_MIPSR1_H__ -#define __NSQ_DEL_DEC_MIPSR1_H__ + + #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/thirdparty/opus/silk/mips/macros_mipsr1.h b/thirdparty/opus/silk/mips/macros_mipsr1.h index 12ed981a6..7b1af7323 100644 --- a/thirdparty/opus/silk/mips/macros_mipsr1.h +++ b/thirdparty/opus/silk/mips/macros_mipsr1.h @@ -1,3 +1,5 @@ +#ifndef __SILK_MACROS_MIPSR1_H__ +#define __SILK_MACROS_MIPSR1_H__ /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -26,8 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef __SILK_MACROS_MIPSR1_H__ -#define __SILK_MACROS_MIPSR1_H__ + + #define mips_clz(x) __builtin_clz(x) diff --git a/thirdparty/opus/silk/mips/sigproc_fix_mipsr1.h b/thirdparty/opus/silk/mips/sigproc_fix_mipsr1.h index 3b0a69536..0bedb49bf 100644 --- a/thirdparty/opus/silk/mips/sigproc_fix_mipsr1.h +++ b/thirdparty/opus/silk/mips/sigproc_fix_mipsr1.h @@ -1,3 +1,5 @@ +#ifndef SILK_SIGPROC_FIX_MIPSR1_H +#define SILK_SIGPROC_FIX_MIPSR1_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_SIGPROC_FIX_MIPSR1_H -#define SILK_SIGPROC_FIX_MIPSR1_H + + #ifdef __cplusplus extern "C" diff --git a/thirdparty/opus/silk/pitch_est_defines.h b/thirdparty/opus/silk/pitch_est_defines.h index e1e4b5d76..2db514080 100644 --- a/thirdparty/opus/silk/pitch_est_defines.h +++ b/thirdparty/opus/silk/pitch_est_defines.h @@ -1,3 +1,5 @@ +#ifndef SILK_PE_DEFINES_H +#define SILK_PE_DEFINES_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_PE_DEFINES_H -#define SILK_PE_DEFINES_H + + #include "SigProc_FIX.h" diff --git a/thirdparty/opus/silk/resampler_private.h b/thirdparty/opus/silk/resampler_private.h index 422a7d9d9..8771e16e1 100644 --- a/thirdparty/opus/silk/resampler_private.h +++ b/thirdparty/opus/silk/resampler_private.h @@ -1,3 +1,5 @@ +#ifndef SILK_RESAMPLER_PRIVATE_H +#define SILK_RESAMPLER_PRIVATE_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_RESAMPLER_PRIVATE_H -#define SILK_RESAMPLER_PRIVATE_H + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/opus/silk/resampler_rom.h b/thirdparty/opus/silk/resampler_rom.h index 490b3388d..9f751be4b 100644 --- a/thirdparty/opus/silk/resampler_rom.h +++ b/thirdparty/opus/silk/resampler_rom.h @@ -1,3 +1,5 @@ +#ifndef SILK_FIX_RESAMPLER_ROM_H +#define SILK_FIX_RESAMPLER_ROM_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_FIX_RESAMPLER_ROM_H -#define SILK_FIX_RESAMPLER_ROM_H + + #ifdef __cplusplus extern "C" diff --git a/thirdparty/opus/silk/resampler_structs.h b/thirdparty/opus/silk/resampler_structs.h index 9e9457d11..f132d02d8 100644 --- a/thirdparty/opus/silk/resampler_structs.h +++ b/thirdparty/opus/silk/resampler_structs.h @@ -1,3 +1,5 @@ +#ifndef SILK_RESAMPLER_STRUCTS_H +#define SILK_RESAMPLER_STRUCTS_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_RESAMPLER_STRUCTS_H -#define SILK_RESAMPLER_STRUCTS_H + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/opus/silk/structs.h b/thirdparty/opus/silk/structs.h index 827829dc6..201ba81c0 100644 --- a/thirdparty/opus/silk/structs.h +++ b/thirdparty/opus/silk/structs.h @@ -1,3 +1,5 @@ +#ifndef SILK_STRUCTS_H +#define SILK_STRUCTS_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_STRUCTS_H -#define SILK_STRUCTS_H + + #include "typedef.h" #include "SigProc_FIX.h" diff --git a/thirdparty/opus/silk/tables.h b/thirdparty/opus/silk/tables.h index 7fea6fda3..00d13c627 100644 --- a/thirdparty/opus/silk/tables.h +++ b/thirdparty/opus/silk/tables.h @@ -1,3 +1,5 @@ +#ifndef SILK_TABLES_H +#define SILK_TABLES_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_TABLES_H -#define SILK_TABLES_H + + #include "define.h" #include "structs.h" diff --git a/thirdparty/opus/silk/tuning_parameters.h b/thirdparty/opus/silk/tuning_parameters.h index 5b8f40423..c403cd962 100644 --- a/thirdparty/opus/silk/tuning_parameters.h +++ b/thirdparty/opus/silk/tuning_parameters.h @@ -1,3 +1,5 @@ +#ifndef SILK_TUNING_PARAMETERS_H +#define SILK_TUNING_PARAMETERS_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_TUNING_PARAMETERS_H -#define SILK_TUNING_PARAMETERS_H + + #ifdef __cplusplus extern "C" diff --git a/thirdparty/opus/silk/typedef.h b/thirdparty/opus/silk/typedef.h index 97b7e709b..e5ec74c71 100644 --- a/thirdparty/opus/silk/typedef.h +++ b/thirdparty/opus/silk/typedef.h @@ -1,3 +1,5 @@ +#ifndef SILK_TYPEDEF_H +#define SILK_TYPEDEF_H /*********************************************************************** Copyright (c) 2006-2011, Skype Limited. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -25,8 +27,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ -#ifndef SILK_TYPEDEF_H -#define SILK_TYPEDEF_H + + #include "opus_types.h" #include "opus_defines.h" diff --git a/thirdparty/opus/silk/x86/SigProc_FIX_sse.h b/thirdparty/opus/silk/x86/SigProc_FIX_sse.h index 61efa8da4..932024046 100644 --- a/thirdparty/opus/silk/x86/SigProc_FIX_sse.h +++ b/thirdparty/opus/silk/x86/SigProc_FIX_sse.h @@ -1,3 +1,5 @@ +#ifndef SIGPROC_FIX_SSE_H +#define SIGPROC_FIX_SSE_H /* Copyright (c) 2014, Cisco Systems, INC Written by XiangMingZhu WeiZhou MinPeng YanWang @@ -25,8 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SIGPROC_FIX_SSE_H -#define SIGPROC_FIX_SSE_H + + #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/thirdparty/opus/silk/x86/main_sse.h b/thirdparty/opus/silk/x86/main_sse.h index d8d61310e..1ea11606f 100644 --- a/thirdparty/opus/silk/x86/main_sse.h +++ b/thirdparty/opus/silk/x86/main_sse.h @@ -1,3 +1,5 @@ +#ifndef MAIN_SSE_H +#define MAIN_SSE_H /* Copyright (c) 2014, Cisco Systems, INC Written by XiangMingZhu WeiZhou MinPeng YanWang @@ -25,8 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MAIN_SSE_H -#define MAIN_SSE_H + + #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/thirdparty/recastnavigation/Recast/Include/Recast.h b/thirdparty/recastnavigation/Recast/Include/Recast.h index 4d557389b..731885551 100644 --- a/thirdparty/recastnavigation/Recast/Include/Recast.h +++ b/thirdparty/recastnavigation/Recast/Include/Recast.h @@ -1,3 +1,5 @@ +#ifndef RECAST_H +#define RECAST_H // // Copyright (c) 2009-2010 Mikko Mononen memon@inside.org // @@ -16,8 +18,8 @@ // 3. This notice may not be removed or altered from any source distribution. // -#ifndef RECAST_H -#define RECAST_H + + /// The value of PI used by Recast. static const float RC_PI = 3.14159265f; diff --git a/thirdparty/recastnavigation/Recast/Include/RecastAlloc.h b/thirdparty/recastnavigation/Recast/Include/RecastAlloc.h index e436af9a0..3007d787f 100644 --- a/thirdparty/recastnavigation/Recast/Include/RecastAlloc.h +++ b/thirdparty/recastnavigation/Recast/Include/RecastAlloc.h @@ -1,3 +1,5 @@ +#ifndef RECASTALLOC_H +#define RECASTALLOC_H // // Copyright (c) 2009-2010 Mikko Mononen memon@inside.org // @@ -16,8 +18,8 @@ // 3. This notice may not be removed or altered from any source distribution. // -#ifndef RECASTALLOC_H -#define RECASTALLOC_H + + #include #include diff --git a/thirdparty/recastnavigation/Recast/Include/RecastAssert.h b/thirdparty/recastnavigation/Recast/Include/RecastAssert.h index e7cc10e49..55d8fd425 100644 --- a/thirdparty/recastnavigation/Recast/Include/RecastAssert.h +++ b/thirdparty/recastnavigation/Recast/Include/RecastAssert.h @@ -1,3 +1,5 @@ +#ifndef RECASTASSERT_H +#define RECASTASSERT_H // // Copyright (c) 2009-2010 Mikko Mononen memon@inside.org // @@ -16,8 +18,8 @@ // 3. This notice may not be removed or altered from any source distribution. // -#ifndef RECASTASSERT_H -#define RECASTASSERT_H + + // Note: This header file's only purpose is to include define assert. // Feel free to change the file and include your own implementation instead. diff --git a/thirdparty/rvo2/API.h b/thirdparty/rvo2/API.h index c64efb452..cf4f764fa 100644 --- a/thirdparty/rvo2/API.h +++ b/thirdparty/rvo2/API.h @@ -1,3 +1,5 @@ +#ifndef RVO_API_H_ +#define RVO_API_H_ /* * API.h * RVO2-3D Library @@ -35,8 +37,8 @@ * \brief Contains definitions related to Microsoft Windows. */ -#ifndef RVO_API_H_ -#define RVO_API_H_ + + // -- GODOT start -- #define RVO_API diff --git a/thirdparty/rvo2/Agent.h b/thirdparty/rvo2/Agent.h index 16f75a08f..e003ed760 100644 --- a/thirdparty/rvo2/Agent.h +++ b/thirdparty/rvo2/Agent.h @@ -1,3 +1,5 @@ +#ifndef RVO_AGENT_H_ +#define RVO_AGENT_H_ /* * Agent.h * RVO2-3D Library @@ -34,8 +36,8 @@ * \file Agent.h * \brief Contains the Agent class. */ -#ifndef RVO_AGENT_H_ -#define RVO_AGENT_H_ + + #include "API.h" diff --git a/thirdparty/rvo2/Definitions.h b/thirdparty/rvo2/Definitions.h index a73aca990..18d754b9a 100644 --- a/thirdparty/rvo2/Definitions.h +++ b/thirdparty/rvo2/Definitions.h @@ -1,3 +1,5 @@ +#ifndef RVO_DEFINITIONS_H_ +#define RVO_DEFINITIONS_H_ /* * Definitions.h * RVO2-3D Library @@ -35,8 +37,8 @@ * \brief Contains functions and constants used in multiple classes. */ -#ifndef RVO_DEFINITIONS_H_ -#define RVO_DEFINITIONS_H_ + + #include "API.h" diff --git a/thirdparty/rvo2/KdTree.h b/thirdparty/rvo2/KdTree.h index 1dbad00ea..1c554d636 100644 --- a/thirdparty/rvo2/KdTree.h +++ b/thirdparty/rvo2/KdTree.h @@ -1,3 +1,5 @@ +#ifndef RVO_KD_TREE_H_ +#define RVO_KD_TREE_H_ /* * KdTree.h * RVO2-3D Library @@ -33,8 +35,8 @@ * \file KdTree.h * \brief Contains the KdTree class. */ -#ifndef RVO_KD_TREE_H_ -#define RVO_KD_TREE_H_ + + #include "API.h" diff --git a/thirdparty/rvo2/Vector3.h b/thirdparty/rvo2/Vector3.h index 8c8835c86..98f2e24ef 100644 --- a/thirdparty/rvo2/Vector3.h +++ b/thirdparty/rvo2/Vector3.h @@ -1,3 +1,5 @@ +#ifndef RVO_VECTOR3_H_ +#define RVO_VECTOR3_H_ /* * Vector3.h * RVO2-3D Library @@ -34,8 +36,8 @@ * \file Vector3.h * \brief Contains the Vector3 class. */ -#ifndef RVO_VECTOR3_H_ -#define RVO_VECTOR3_H_ + + #include "API.h" diff --git a/thirdparty/squish/alpha.h b/thirdparty/squish/alpha.h index a1fffd404..5243d384b 100644 --- a/thirdparty/squish/alpha.h +++ b/thirdparty/squish/alpha.h @@ -1,3 +1,5 @@ +#ifndef SQUISH_ALPHA_H +#define SQUISH_ALPHA_H /* ----------------------------------------------------------------------------- Copyright (c) 2006 Simon Brown si@sjbrown.co.uk @@ -23,8 +25,8 @@ -------------------------------------------------------------------------- */ -#ifndef SQUISH_ALPHA_H -#define SQUISH_ALPHA_H + + #include "squish.h" diff --git a/thirdparty/squish/clusterfit.h b/thirdparty/squish/clusterfit.h index 999396b26..d33256c0b 100644 --- a/thirdparty/squish/clusterfit.h +++ b/thirdparty/squish/clusterfit.h @@ -1,3 +1,5 @@ +#ifndef SQUISH_CLUSTERFIT_H +#define SQUISH_CLUSTERFIT_H /* ----------------------------------------------------------------------------- Copyright (c) 2006 Simon Brown si@sjbrown.co.uk @@ -24,8 +26,8 @@ -------------------------------------------------------------------------- */ -#ifndef SQUISH_CLUSTERFIT_H -#define SQUISH_CLUSTERFIT_H + + #include "squish.h" #include "maths.h" diff --git a/thirdparty/squish/colourblock.h b/thirdparty/squish/colourblock.h index 3cb9b7e3b..bb57d39e5 100644 --- a/thirdparty/squish/colourblock.h +++ b/thirdparty/squish/colourblock.h @@ -1,3 +1,5 @@ +#ifndef SQUISH_COLOURBLOCK_H +#define SQUISH_COLOURBLOCK_H /* ----------------------------------------------------------------------------- Copyright (c) 2006 Simon Brown si@sjbrown.co.uk @@ -23,8 +25,8 @@ -------------------------------------------------------------------------- */ -#ifndef SQUISH_COLOURBLOCK_H -#define SQUISH_COLOURBLOCK_H + + #include "squish.h" #include "maths.h" diff --git a/thirdparty/squish/colourfit.h b/thirdparty/squish/colourfit.h index e73dceb2e..b68d0a7fb 100644 --- a/thirdparty/squish/colourfit.h +++ b/thirdparty/squish/colourfit.h @@ -1,3 +1,5 @@ +#ifndef SQUISH_COLOURFIT_H +#define SQUISH_COLOURFIT_H /* ----------------------------------------------------------------------------- Copyright (c) 2006 Simon Brown si@sjbrown.co.uk @@ -23,8 +25,8 @@ -------------------------------------------------------------------------- */ -#ifndef SQUISH_COLOURFIT_H -#define SQUISH_COLOURFIT_H + + #include "squish.h" #include "maths.h" diff --git a/thirdparty/squish/colourset.h b/thirdparty/squish/colourset.h index e13bb6fc3..eb22d20fd 100644 --- a/thirdparty/squish/colourset.h +++ b/thirdparty/squish/colourset.h @@ -1,3 +1,5 @@ +#ifndef SQUISH_COLOURSET_H +#define SQUISH_COLOURSET_H /* ----------------------------------------------------------------------------- Copyright (c) 2006 Simon Brown si@sjbrown.co.uk @@ -23,8 +25,8 @@ -------------------------------------------------------------------------- */ -#ifndef SQUISH_COLOURSET_H -#define SQUISH_COLOURSET_H + + #include "squish.h" #include "maths.h" diff --git a/thirdparty/squish/config.h b/thirdparty/squish/config.h index 05f8d7259..cb5aca029 100644 --- a/thirdparty/squish/config.h +++ b/thirdparty/squish/config.h @@ -1,3 +1,5 @@ +#ifndef SQUISH_CONFIG_H +#define SQUISH_CONFIG_H /* ----------------------------------------------------------------------------- Copyright (c) 2006 Simon Brown si@sjbrown.co.uk @@ -23,8 +25,8 @@ -------------------------------------------------------------------------- */ -#ifndef SQUISH_CONFIG_H -#define SQUISH_CONFIG_H + + // Set to 1 when building squish to use Altivec instructions. #ifndef SQUISH_USE_ALTIVEC diff --git a/thirdparty/squish/maths.h b/thirdparty/squish/maths.h index 59c32196b..43ecc50a4 100644 --- a/thirdparty/squish/maths.h +++ b/thirdparty/squish/maths.h @@ -1,3 +1,5 @@ +#ifndef SQUISH_MATHS_H +#define SQUISH_MATHS_H /* ----------------------------------------------------------------------------- Copyright (c) 2006 Simon Brown si@sjbrown.co.uk @@ -23,8 +25,8 @@ -------------------------------------------------------------------------- */ -#ifndef SQUISH_MATHS_H -#define SQUISH_MATHS_H + + #include #include diff --git a/thirdparty/squish/rangefit.h b/thirdparty/squish/rangefit.h index bdb21a900..6880a64e1 100644 --- a/thirdparty/squish/rangefit.h +++ b/thirdparty/squish/rangefit.h @@ -1,3 +1,5 @@ +#ifndef SQUISH_RANGEFIT_H +#define SQUISH_RANGEFIT_H /* ----------------------------------------------------------------------------- Copyright (c) 2006 Simon Brown si@sjbrown.co.uk @@ -23,8 +25,8 @@ -------------------------------------------------------------------------- */ -#ifndef SQUISH_RANGEFIT_H -#define SQUISH_RANGEFIT_H + + #include "squish.h" #include "colourfit.h" diff --git a/thirdparty/squish/simd.h b/thirdparty/squish/simd.h index 1e02fa160..fa5b671d2 100644 --- a/thirdparty/squish/simd.h +++ b/thirdparty/squish/simd.h @@ -1,3 +1,5 @@ +#ifndef SQUISH_SIMD_H +#define SQUISH_SIMD_H /* ----------------------------------------------------------------------------- Copyright (c) 2006 Simon Brown si@sjbrown.co.uk @@ -23,8 +25,8 @@ -------------------------------------------------------------------------- */ -#ifndef SQUISH_SIMD_H -#define SQUISH_SIMD_H + + #include "maths.h" diff --git a/thirdparty/squish/simd_float.h b/thirdparty/squish/simd_float.h index 030ea7095..4bbbd8dc1 100644 --- a/thirdparty/squish/simd_float.h +++ b/thirdparty/squish/simd_float.h @@ -1,3 +1,5 @@ +#ifndef SQUISH_SIMD_FLOAT_H +#define SQUISH_SIMD_FLOAT_H /* ----------------------------------------------------------------------------- Copyright (c) 2006 Simon Brown si@sjbrown.co.uk @@ -23,8 +25,8 @@ -------------------------------------------------------------------------- */ -#ifndef SQUISH_SIMD_FLOAT_H -#define SQUISH_SIMD_FLOAT_H + + #include diff --git a/thirdparty/squish/simd_sse.h b/thirdparty/squish/simd_sse.h index 2e8be4ca7..2704faf6d 100644 --- a/thirdparty/squish/simd_sse.h +++ b/thirdparty/squish/simd_sse.h @@ -1,3 +1,5 @@ +#ifndef SQUISH_SIMD_SSE_H +#define SQUISH_SIMD_SSE_H /* ----------------------------------------------------------------------------- Copyright (c) 2006 Simon Brown si@sjbrown.co.uk @@ -23,8 +25,8 @@ -------------------------------------------------------------------------- */ -#ifndef SQUISH_SIMD_SSE_H -#define SQUISH_SIMD_SSE_H + + #include #if ( SQUISH_USE_SSE > 1 ) diff --git a/thirdparty/squish/simd_ve.h b/thirdparty/squish/simd_ve.h index 08a153750..473c2bd51 100644 --- a/thirdparty/squish/simd_ve.h +++ b/thirdparty/squish/simd_ve.h @@ -1,3 +1,5 @@ +#ifndef SQUISH_SIMD_VE_H +#define SQUISH_SIMD_VE_H /* ----------------------------------------------------------------------------- Copyright (c) 2006 Simon Brown si@sjbrown.co.uk @@ -23,8 +25,8 @@ -------------------------------------------------------------------------- */ -#ifndef SQUISH_SIMD_VE_H -#define SQUISH_SIMD_VE_H + + #include #undef bool diff --git a/thirdparty/squish/singlecolourfit.h b/thirdparty/squish/singlecolourfit.h index 974ce7725..2f15165c2 100644 --- a/thirdparty/squish/singlecolourfit.h +++ b/thirdparty/squish/singlecolourfit.h @@ -1,3 +1,5 @@ +#ifndef SQUISH_SINGLECOLOURFIT_H +#define SQUISH_SINGLECOLOURFIT_H /* ----------------------------------------------------------------------------- Copyright (c) 2006 Simon Brown si@sjbrown.co.uk @@ -23,8 +25,8 @@ -------------------------------------------------------------------------- */ -#ifndef SQUISH_SINGLECOLOURFIT_H -#define SQUISH_SINGLECOLOURFIT_H + + #include "squish.h" #include "colourfit.h" diff --git a/thirdparty/squish/squish.h b/thirdparty/squish/squish.h index 14c9bb59f..f78f9dc26 100644 --- a/thirdparty/squish/squish.h +++ b/thirdparty/squish/squish.h @@ -1,3 +1,5 @@ +#ifndef SQUISH_H +#define SQUISH_H /* ----------------------------------------------------------------------------- Copyright (c) 2006 Simon Brown si@sjbrown.co.uk @@ -23,8 +25,8 @@ -------------------------------------------------------------------------- */ -#ifndef SQUISH_H -#define SQUISH_H + + //! All squish API functions live in this namespace. namespace squish { diff --git a/thirdparty/stb_rect_pack/stb_rect_pack.h b/thirdparty/stb_rect_pack/stb_rect_pack.h index 4713661a4..22bdf77c1 100644 --- a/thirdparty/stb_rect_pack/stb_rect_pack.h +++ b/thirdparty/stb_rect_pack/stb_rect_pack.h @@ -1,3 +1,5 @@ +#ifndef STB_INCLUDE_STB_RECT_PACK_H +#define STB_INCLUDE_STB_RECT_PACK_H // stb_rect_pack.h - v1.01 - public domain - rectangle packing // Sean Barrett 2014 // @@ -63,8 +65,8 @@ // INCLUDE SECTION // -#ifndef STB_INCLUDE_STB_RECT_PACK_H -#define STB_INCLUDE_STB_RECT_PACK_H + + #define STB_RECT_PACK_VERSION 1 diff --git a/thirdparty/vhacd/inc/btAlignedAllocator.h b/thirdparty/vhacd/inc/btAlignedAllocator.h index 94e71d512..dd61bcf5e 100644 --- a/thirdparty/vhacd/inc/btAlignedAllocator.h +++ b/thirdparty/vhacd/inc/btAlignedAllocator.h @@ -1,3 +1,5 @@ +#ifndef BT_ALIGNED_ALLOCATOR +#define BT_ALIGNED_ALLOCATOR /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_ALIGNED_ALLOCATOR -#define BT_ALIGNED_ALLOCATOR + + ///we probably replace this with our own aligned memory allocator ///so we replace _aligned_malloc and _aligned_free with our own diff --git a/thirdparty/vhacd/inc/btAlignedObjectArray.h b/thirdparty/vhacd/inc/btAlignedObjectArray.h index 1ce03d21b..f9259fbf4 100644 --- a/thirdparty/vhacd/inc/btAlignedObjectArray.h +++ b/thirdparty/vhacd/inc/btAlignedObjectArray.h @@ -1,3 +1,5 @@ +#ifndef BT_OBJECT_ARRAY__ +#define BT_OBJECT_ARRAY__ /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ @@ -13,8 +15,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_OBJECT_ARRAY__ -#define BT_OBJECT_ARRAY__ + + #include "btAlignedAllocator.h" #include "btScalar.h" // has definitions like SIMD_FORCE_INLINE diff --git a/thirdparty/vhacd/inc/btConvexHullComputer.h b/thirdparty/vhacd/inc/btConvexHullComputer.h index 04bb96f64..40df113ac 100644 --- a/thirdparty/vhacd/inc/btConvexHullComputer.h +++ b/thirdparty/vhacd/inc/btConvexHullComputer.h @@ -1,3 +1,5 @@ +#ifndef BT_CONVEX_HULL_COMPUTER_H +#define BT_CONVEX_HULL_COMPUTER_H /* Copyright (c) 2011 Ole Kniemeyer, MAXON, www.maxon.net @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_CONVEX_HULL_COMPUTER_H -#define BT_CONVEX_HULL_COMPUTER_H + + #include "btAlignedObjectArray.h" #include "btVector3.h" diff --git a/thirdparty/vhacd/inc/btMinMax.h b/thirdparty/vhacd/inc/btMinMax.h index 9bc1e1c77..2e0a1eb3d 100644 --- a/thirdparty/vhacd/inc/btMinMax.h +++ b/thirdparty/vhacd/inc/btMinMax.h @@ -1,3 +1,5 @@ +#ifndef BT_GEN_MINMAX_H +#define BT_GEN_MINMAX_H /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans http://continuousphysics.com/Bullet/ @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_GEN_MINMAX_H -#define BT_GEN_MINMAX_H + + #include "btScalar.h" diff --git a/thirdparty/vhacd/inc/btScalar.h b/thirdparty/vhacd/inc/btScalar.h index da2a5993c..c5973b44e 100644 --- a/thirdparty/vhacd/inc/btScalar.h +++ b/thirdparty/vhacd/inc/btScalar.h @@ -1,3 +1,5 @@ +#ifndef BT_SCALAR_H +#define BT_SCALAR_H /* Copyright (c) 2003-2009 Erwin Coumans http://bullet.googlecode.com @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_SCALAR_H -#define BT_SCALAR_H + + #ifdef BT_MANAGED_CODE //Aligned data types not supported in managed code diff --git a/thirdparty/vhacd/inc/btVector3.h b/thirdparty/vhacd/inc/btVector3.h index 4ed971673..26f671236 100644 --- a/thirdparty/vhacd/inc/btVector3.h +++ b/thirdparty/vhacd/inc/btVector3.h @@ -1,3 +1,5 @@ +#ifndef BT_VECTOR3_H +#define BT_VECTOR3_H /* Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans http://continuousphysics.com/Bullet/ @@ -12,8 +14,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#ifndef BT_VECTOR3_H -#define BT_VECTOR3_H + + #include "btMinMax.h" #include "btScalar.h" diff --git a/thirdparty/vhacd/inc/vhacdCircularList.h b/thirdparty/vhacd/inc/vhacdCircularList.h index 0f5ddf9ec..1c130020a 100644 --- a/thirdparty/vhacd/inc/vhacdCircularList.h +++ b/thirdparty/vhacd/inc/vhacdCircularList.h @@ -1,3 +1,5 @@ +#ifndef VHACD_CIRCULAR_LIST_H +#define VHACD_CIRCULAR_LIST_H /* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com) All rights reserved. @@ -13,8 +15,8 @@ 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 HOLDER 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. */ #pragma once -#ifndef VHACD_CIRCULAR_LIST_H -#define VHACD_CIRCULAR_LIST_H + + #include namespace VHACD { //! CircularListElement class. diff --git a/thirdparty/vhacd/inc/vhacdICHull.h b/thirdparty/vhacd/inc/vhacdICHull.h index 132bdcfb3..90a070fea 100644 --- a/thirdparty/vhacd/inc/vhacdICHull.h +++ b/thirdparty/vhacd/inc/vhacdICHull.h @@ -1,3 +1,5 @@ +#ifndef VHACD_ICHULL_H +#define VHACD_ICHULL_H /* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com) All rights reserved. @@ -13,8 +15,8 @@ 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 HOLDER 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. */ #pragma once -#ifndef VHACD_ICHULL_H -#define VHACD_ICHULL_H + + #include "vhacdManifoldMesh.h" #include "vhacdVector.h" diff --git a/thirdparty/vhacd/inc/vhacdManifoldMesh.h b/thirdparty/vhacd/inc/vhacdManifoldMesh.h index a48f53c5c..910e52821 100644 --- a/thirdparty/vhacd/inc/vhacdManifoldMesh.h +++ b/thirdparty/vhacd/inc/vhacdManifoldMesh.h @@ -1,3 +1,5 @@ +#ifndef VHACD_MANIFOLD_MESH_H +#define VHACD_MANIFOLD_MESH_H /* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com) All rights reserved. @@ -13,8 +15,8 @@ All rights reserved. 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 HOLDER 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. */ #pragma once -#ifndef VHACD_MANIFOLD_MESH_H -#define VHACD_MANIFOLD_MESH_H + + #include "vhacdCircularList.h" #include "vhacdSArray.h" #include "vhacdVector.h" diff --git a/thirdparty/vhacd/inc/vhacdMesh.h b/thirdparty/vhacd/inc/vhacdMesh.h index a282e2b4f..46279c4f0 100644 --- a/thirdparty/vhacd/inc/vhacdMesh.h +++ b/thirdparty/vhacd/inc/vhacdMesh.h @@ -1,3 +1,5 @@ +#ifndef VHACD_MESH_H +#define VHACD_MESH_H /* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com) All rights reserved. @@ -13,8 +15,8 @@ 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 HOLDER 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. */ #pragma once -#ifndef VHACD_MESH_H -#define VHACD_MESH_H + + #include "vhacdSArray.h" #include "vhacdVector.h" diff --git a/thirdparty/vhacd/inc/vhacdMutex.h b/thirdparty/vhacd/inc/vhacdMutex.h index d587dd638..49e56d1fd 100644 --- a/thirdparty/vhacd/inc/vhacdMutex.h +++ b/thirdparty/vhacd/inc/vhacdMutex.h @@ -1,3 +1,5 @@ +#ifndef VHACD_MUTEX_H +#define VHACD_MUTEX_H /*! ** ** Copyright (c) 2009 by John W. Ratcliff mailto:jratcliffscarab@gmail.com @@ -47,8 +49,8 @@ */ #pragma once -#ifndef VHACD_MUTEX_H -#define VHACD_MUTEX_H + + #if defined(WIN32) diff --git a/thirdparty/vhacd/inc/vhacdSArray.h b/thirdparty/vhacd/inc/vhacdSArray.h index 4d84d1ae2..50804717e 100644 --- a/thirdparty/vhacd/inc/vhacdSArray.h +++ b/thirdparty/vhacd/inc/vhacdSArray.h @@ -1,3 +1,5 @@ +#ifndef VHACD_SARRAY_H +#define VHACD_SARRAY_H /* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com) All rights reserved. @@ -13,8 +15,8 @@ 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 HOLDER 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. */ #pragma once -#ifndef VHACD_SARRAY_H -#define VHACD_SARRAY_H + + #include #include #include diff --git a/thirdparty/vhacd/inc/vhacdTimer.h b/thirdparty/vhacd/inc/vhacdTimer.h index ba0e2c336..11bbd1fda 100644 --- a/thirdparty/vhacd/inc/vhacdTimer.h +++ b/thirdparty/vhacd/inc/vhacdTimer.h @@ -1,3 +1,5 @@ +#ifndef VHACD_TIMER_H +#define VHACD_TIMER_H /* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com) All rights reserved. @@ -13,8 +15,8 @@ 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 HOLDER 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. */ #pragma once -#ifndef VHACD_TIMER_H -#define VHACD_TIMER_H + + #ifdef _WIN32 #ifndef WIN32_LEAN_AND_MEAN diff --git a/thirdparty/vhacd/inc/vhacdVHACD.h b/thirdparty/vhacd/inc/vhacdVHACD.h index d67b10764..b24a05de9 100644 --- a/thirdparty/vhacd/inc/vhacdVHACD.h +++ b/thirdparty/vhacd/inc/vhacdVHACD.h @@ -1,3 +1,5 @@ +#ifndef VHACD_VHACD_H +#define VHACD_VHACD_H /* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com) All rights reserved. @@ -13,8 +15,8 @@ Redistribution and use in source and binary forms, with or without modification, 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 HOLDER 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. */ #pragma once -#ifndef VHACD_VHACD_H -#define VHACD_VHACD_H + + #ifdef OPENCL_FOUND #ifdef __MACH__ diff --git a/thirdparty/vhacd/inc/vhacdVector.h b/thirdparty/vhacd/inc/vhacdVector.h index efcfcf6ad..e44f9df3a 100644 --- a/thirdparty/vhacd/inc/vhacdVector.h +++ b/thirdparty/vhacd/inc/vhacdVector.h @@ -1,3 +1,5 @@ +#ifndef VHACD_VECTOR_H +#define VHACD_VECTOR_H /* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com) All rights reserved. @@ -13,8 +15,8 @@ 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 HOLDER 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. */ #pragma once -#ifndef VHACD_VECTOR_H -#define VHACD_VECTOR_H + + #include #include diff --git a/thirdparty/vhacd/inc/vhacdVolume.h b/thirdparty/vhacd/inc/vhacdVolume.h index c445f2012..3bb701955 100644 --- a/thirdparty/vhacd/inc/vhacdVolume.h +++ b/thirdparty/vhacd/inc/vhacdVolume.h @@ -1,3 +1,5 @@ +#ifndef VHACD_VOLUME_H +#define VHACD_VOLUME_H /* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com) All rights reserved. @@ -13,8 +15,8 @@ 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 HOLDER 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. */ #pragma once -#ifndef VHACD_VOLUME_H -#define VHACD_VOLUME_H + + #include "vhacdMesh.h" #include "vhacdVector.h" #include diff --git a/thirdparty/vhacd/public/VHACD.h b/thirdparty/vhacd/public/VHACD.h index 863aeda9d..e1233d5eb 100644 --- a/thirdparty/vhacd/public/VHACD.h +++ b/thirdparty/vhacd/public/VHACD.h @@ -1,3 +1,5 @@ +#ifndef VHACD_H +#define VHACD_H /* Copyright (c) 2011 Khaled Mamou (kmamou at gmail dot com) All rights reserved. @@ -13,8 +15,8 @@ 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 HOLDER 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. */ #pragma once -#ifndef VHACD_H -#define VHACD_H + + #define VHACD_VERSION_MAJOR 2 #define VHACD_VERSION_MINOR 3 diff --git a/thirdparty/wslay/wslay/wslay.h b/thirdparty/wslay/wslay/wslay.h index ac6873613..0244b9d97 100644 --- a/thirdparty/wslay/wslay/wslay.h +++ b/thirdparty/wslay/wslay/wslay.h @@ -1,3 +1,5 @@ +#ifndef WSLAY_H +#define WSLAY_H /* * Wslay - The WebSocket Library * @@ -22,8 +24,8 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef WSLAY_H -#define WSLAY_H + + #ifdef __cplusplus extern "C" { diff --git a/thirdparty/wslay/wslay/wslayver.h b/thirdparty/wslay/wslay/wslayver.h index 28f201803..791c16d8b 100644 --- a/thirdparty/wslay/wslay/wslayver.h +++ b/thirdparty/wslay/wslay/wslayver.h @@ -1,3 +1,5 @@ +#ifndef WSLAYVER_H +#define WSLAYVER_H /* * Wslay - The WebSocket Library * @@ -22,8 +24,8 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef WSLAYVER_H -#define WSLAYVER_H + + /* Version number of wslay release */ #define WSLAY_VERSION "1.1.1" diff --git a/thirdparty/wslay/wslay_event.h b/thirdparty/wslay/wslay_event.h index e30c3d194..104e39008 100644 --- a/thirdparty/wslay/wslay_event.h +++ b/thirdparty/wslay/wslay_event.h @@ -1,3 +1,5 @@ +#ifndef WSLAY_EVENT_H +#define WSLAY_EVENT_H /* * Wslay - The WebSocket Library * @@ -22,8 +24,8 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef WSLAY_EVENT_H -#define WSLAY_EVENT_H + + #ifdef HAVE_CONFIG_H # include diff --git a/thirdparty/wslay/wslay_frame.h b/thirdparty/wslay/wslay_frame.h index 3ac98112b..8a4359612 100644 --- a/thirdparty/wslay/wslay_frame.h +++ b/thirdparty/wslay/wslay_frame.h @@ -1,3 +1,5 @@ +#ifndef WSLAY_FRAME_H +#define WSLAY_FRAME_H /* * Wslay - The WebSocket Library * @@ -22,8 +24,8 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef WSLAY_FRAME_H -#define WSLAY_FRAME_H + + #ifdef HAVE_CONFIG_H # include diff --git a/thirdparty/wslay/wslay_macro.h b/thirdparty/wslay/wslay_macro.h index a06cff98e..2037043ef 100644 --- a/thirdparty/wslay/wslay_macro.h +++ b/thirdparty/wslay/wslay_macro.h @@ -1,3 +1,5 @@ +#ifndef WSLAY_MACRO_H +#define WSLAY_MACRO_H /* * Wslay - The WebSocket Library * @@ -22,8 +24,8 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef WSLAY_MACRO_H -#define WSLAY_MACRO_H + + #ifdef HAVE_CONFIG_H # include "config.h" diff --git a/thirdparty/wslay/wslay_net.h b/thirdparty/wslay/wslay_net.h index 231087015..bf3e7a89b 100644 --- a/thirdparty/wslay/wslay_net.h +++ b/thirdparty/wslay/wslay_net.h @@ -1,3 +1,5 @@ +#ifndef WSLAY_NET_H +#define WSLAY_NET_H /* * Wslay - The WebSocket Library * @@ -22,8 +24,8 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef WSLAY_NET_H -#define WSLAY_NET_H + + #ifdef HAVE_CONFIG_H # include diff --git a/thirdparty/wslay/wslay_queue.h b/thirdparty/wslay/wslay_queue.h index fa16aea48..1d6b998af 100644 --- a/thirdparty/wslay/wslay_queue.h +++ b/thirdparty/wslay/wslay_queue.h @@ -1,3 +1,5 @@ +#ifndef WSLAY_QUEUE_H +#define WSLAY_QUEUE_H /* * Wslay - The WebSocket Library * @@ -22,8 +24,8 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef WSLAY_QUEUE_H -#define WSLAY_QUEUE_H + + #ifdef HAVE_CONFIG_H # include "config.h" diff --git a/thirdparty/zlib/deflate.h b/thirdparty/zlib/deflate.h index 23ecdd312..ae668c2b9 100644 --- a/thirdparty/zlib/deflate.h +++ b/thirdparty/zlib/deflate.h @@ -1,3 +1,5 @@ +#ifndef DEFLATE_H +#define DEFLATE_H /* deflate.h -- internal compression state * Copyright (C) 1995-2016 Jean-loup Gailly * For conditions of distribution and use, see copyright notice in zlib.h @@ -10,8 +12,8 @@ /* @(#) $Id$ */ -#ifndef DEFLATE_H -#define DEFLATE_H + + #include "zutil.h" diff --git a/thirdparty/zlib/gzguts.h b/thirdparty/zlib/gzguts.h index 990a4d251..7421b3fbd 100644 --- a/thirdparty/zlib/gzguts.h +++ b/thirdparty/zlib/gzguts.h @@ -1,3 +1,5 @@ +#ifndef _POSIX_SOURCE +#define GZBUFSIZE 8192 /* gzguts.h -- zlib internal header definitions for gz* operations * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h @@ -26,7 +28,7 @@ # include #endif -#ifndef _POSIX_SOURCE + # define _POSIX_SOURCE #endif #include @@ -153,7 +155,7 @@ /* default i/o buffer size -- double this for output when reading (this and twice this must be able to fit in an unsigned type) */ -#define GZBUFSIZE 8192 + /* gzip modes, also provide a little integrity check on the passed structure */ #define GZ_NONE 0 diff --git a/thirdparty/zlib/zconf.h b/thirdparty/zlib/zconf.h index 5e1d68a00..41df7a416 100644 --- a/thirdparty/zlib/zconf.h +++ b/thirdparty/zlib/zconf.h @@ -1,3 +1,5 @@ +#ifndef ZCONF_H +#define ZCONF_H /* zconf.h -- configuration of the zlib compression library * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h @@ -5,8 +7,8 @@ /* @(#) $Id$ */ -#ifndef ZCONF_H -#define ZCONF_H + + /* * If you *really* need a unique prefix for all types and library functions, diff --git a/thirdparty/zlib/zlib.h b/thirdparty/zlib/zlib.h index f09cdaf1e..9a55b88ff 100644 --- a/thirdparty/zlib/zlib.h +++ b/thirdparty/zlib/zlib.h @@ -1,3 +1,5 @@ +#ifndef ZLIB_H +#define ZLIB_H /* zlib.h -- interface of the 'zlib' general purpose compression library version 1.2.11, January 15th, 2017 @@ -28,8 +30,8 @@ (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format). */ -#ifndef ZLIB_H -#define ZLIB_H + + #include "zconf.h" diff --git a/thirdparty/zlib/zutil.h b/thirdparty/zlib/zutil.h index b079ea6a8..736f6085c 100644 --- a/thirdparty/zlib/zutil.h +++ b/thirdparty/zlib/zutil.h @@ -1,3 +1,5 @@ +#ifndef ZUTIL_H +#define ZUTIL_H /* zutil.h -- internal interface and configuration of the compression library * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h @@ -10,8 +12,8 @@ /* @(#) $Id$ */ -#ifndef ZUTIL_H -#define ZUTIL_H + + #ifdef HAVE_HIDDEN # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) diff --git a/thirdparty/zstd/common/bitstream.h b/thirdparty/zstd/common/bitstream.h index 2e5a933ad..534c43096 100644 --- a/thirdparty/zstd/common/bitstream.h +++ b/thirdparty/zstd/common/bitstream.h @@ -1,3 +1,5 @@ +#ifndef BITSTREAM_H_MODULE +#define BITSTREAM_H_MODULE /* ****************************************************************** * bitstream * Part of FSE library @@ -11,8 +13,8 @@ * in the COPYING file in the root directory of this source tree). * You may select, at your option, one of the above-listed licenses. ****************************************************************** */ -#ifndef BITSTREAM_H_MODULE -#define BITSTREAM_H_MODULE + + #if defined (__cplusplus) extern "C" { diff --git a/thirdparty/zstd/common/compiler.h b/thirdparty/zstd/common/compiler.h index a951d0ade..2be61707b 100644 --- a/thirdparty/zstd/common/compiler.h +++ b/thirdparty/zstd/common/compiler.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_COMPILER_H +#define ZSTD_COMPILER_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_COMPILER_H -#define ZSTD_COMPILER_H + + /*-******************************************************* * Compiler specifics diff --git a/thirdparty/zstd/common/cpu.h b/thirdparty/zstd/common/cpu.h index 8acd33be3..fb49f9e62 100644 --- a/thirdparty/zstd/common/cpu.h +++ b/thirdparty/zstd/common/cpu.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_COMMON_CPU_H +#define ZSTD_COMMON_CPU_H /* * Copyright (c) Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_COMMON_CPU_H -#define ZSTD_COMMON_CPU_H + + /** * Implementation taken from folly/CpuId.h diff --git a/thirdparty/zstd/common/debug.h b/thirdparty/zstd/common/debug.h index 3b2a320a1..c8de8285f 100644 --- a/thirdparty/zstd/common/debug.h +++ b/thirdparty/zstd/common/debug.h @@ -1,3 +1,5 @@ +#ifndef DEBUG_H_12987983217 +#define DEBUG_H_12987983217 /* ****************************************************************** * debug * Part of FSE library @@ -29,8 +31,8 @@ * and is a global variable, not multi-thread protected (use with care) */ -#ifndef DEBUG_H_12987983217 -#define DEBUG_H_12987983217 + + #if defined (__cplusplus) extern "C" { diff --git a/thirdparty/zstd/common/error_private.h b/thirdparty/zstd/common/error_private.h index 6d8b9f776..c5024063f 100644 --- a/thirdparty/zstd/common/error_private.h +++ b/thirdparty/zstd/common/error_private.h @@ -1,3 +1,5 @@ +#ifndef ERROR_H_MODULE +#define ERROR_H_MODULE /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -10,8 +12,8 @@ /* Note : this module is expected to remain private, do not expose it */ -#ifndef ERROR_H_MODULE -#define ERROR_H_MODULE + + #if defined (__cplusplus) extern "C" { diff --git a/thirdparty/zstd/common/fse.h b/thirdparty/zstd/common/fse.h index 19dd4febc..9c6cf9fbc 100644 --- a/thirdparty/zstd/common/fse.h +++ b/thirdparty/zstd/common/fse.h @@ -1,3 +1,5 @@ +#ifndef FSE_H +#define FSE_H /* ****************************************************************** * FSE : Finite State Entropy codec * Public Prototypes declaration @@ -16,8 +18,8 @@ extern "C" { #endif -#ifndef FSE_H -#define FSE_H + + /*-***************************************** diff --git a/thirdparty/zstd/common/huf.h b/thirdparty/zstd/common/huf.h index 3d47ced03..3234b32b4 100644 --- a/thirdparty/zstd/common/huf.h +++ b/thirdparty/zstd/common/huf.h @@ -1,3 +1,5 @@ +#ifndef HUF_H_298734234 +#define HUF_H_298734234 /* ****************************************************************** * huff0 huffman codec, * part of Finite State Entropy library @@ -16,8 +18,8 @@ extern "C" { #endif -#ifndef HUF_H_298734234 -#define HUF_H_298734234 + + /* *** Dependencies *** */ #include "zstd_deps.h" /* size_t */ diff --git a/thirdparty/zstd/common/mem.h b/thirdparty/zstd/common/mem.h index 9f3b81ab9..b8b8824d6 100644 --- a/thirdparty/zstd/common/mem.h +++ b/thirdparty/zstd/common/mem.h @@ -1,3 +1,5 @@ +#ifndef MEM_H_MODULE +#define MEM_H_MODULE /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef MEM_H_MODULE -#define MEM_H_MODULE + + #if defined (__cplusplus) extern "C" { diff --git a/thirdparty/zstd/common/pool.h b/thirdparty/zstd/common/pool.h index e18aa0708..7d3705c99 100644 --- a/thirdparty/zstd/common/pool.h +++ b/thirdparty/zstd/common/pool.h @@ -1,3 +1,5 @@ +#ifndef POOL_H +#define POOL_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef POOL_H -#define POOL_H + + #if defined (__cplusplus) extern "C" { diff --git a/thirdparty/zstd/common/threading.h b/thirdparty/zstd/common/threading.h index fd0060d5a..da2021cac 100644 --- a/thirdparty/zstd/common/threading.h +++ b/thirdparty/zstd/common/threading.h @@ -1,3 +1,5 @@ +#ifndef THREADING_H_938743 +#define THREADING_H_938743 /** * Copyright (c) 2016 Tino Reichardt * All rights reserved. @@ -11,8 +13,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef THREADING_H_938743 -#define THREADING_H_938743 + + #include "debug.h" diff --git a/thirdparty/zstd/common/xxhash.h b/thirdparty/zstd/common/xxhash.h index 16c1f1617..29b62859b 100644 --- a/thirdparty/zstd/common/xxhash.h +++ b/thirdparty/zstd/common/xxhash.h @@ -1,3 +1,5 @@ +#ifndef XXHASH_H_5627135585666179 +#define XXHASH_H_5627135585666179 1 /* * xxHash - Extremely Fast Hash algorithm * Header File @@ -48,8 +50,8 @@ XXH32 6.8 GB/s 6.0 GB/s extern "C" { #endif -#ifndef XXHASH_H_5627135585666179 -#define XXHASH_H_5627135585666179 1 + + /* **************************** diff --git a/thirdparty/zstd/common/zstd_deps.h b/thirdparty/zstd/common/zstd_deps.h index 14211344a..45fc02063 100644 --- a/thirdparty/zstd/common/zstd_deps.h +++ b/thirdparty/zstd/common/zstd_deps.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_DEPS_COMMON +#define ZSTD_DEPS_COMMON /* * Copyright (c) Facebook, Inc. * All rights reserved. @@ -21,8 +23,8 @@ * ZSTD_memset() * ZSTD_memmove() */ -#ifndef ZSTD_DEPS_COMMON -#define ZSTD_DEPS_COMMON + + #include #include diff --git a/thirdparty/zstd/common/zstd_internal.h b/thirdparty/zstd/common/zstd_internal.h index 68252e987..5df7b11fb 100644 --- a/thirdparty/zstd/common/zstd_internal.h +++ b/thirdparty/zstd/common/zstd_internal.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_CCOMMON_H_MODULE +#define ZSTD_CCOMMON_H_MODULE /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_CCOMMON_H_MODULE -#define ZSTD_CCOMMON_H_MODULE + + /* this module contains definitions which must be identical * across compression, decompression and dictBuilder. diff --git a/thirdparty/zstd/common/zstd_trace.h b/thirdparty/zstd/common/zstd_trace.h index 2da564077..34447aabf 100644 --- a/thirdparty/zstd/common/zstd_trace.h +++ b/thirdparty/zstd/common/zstd_trace.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_TRACE_H +#define ZSTD_TRACE_H /* * Copyright (c) Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_TRACE_H -#define ZSTD_TRACE_H + + #if defined (__cplusplus) extern "C" { diff --git a/thirdparty/zstd/compress/zstd_compress_internal.h b/thirdparty/zstd/compress/zstd_compress_internal.h index 3b04fd09f..544211889 100644 --- a/thirdparty/zstd/compress/zstd_compress_internal.h +++ b/thirdparty/zstd/compress/zstd_compress_internal.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_COMPRESS_H +#define ZSTD_COMPRESS_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -12,8 +14,8 @@ * that shall **only** be used by modules within lib/compress. */ -#ifndef ZSTD_COMPRESS_H -#define ZSTD_COMPRESS_H + + /*-************************************* * Dependencies diff --git a/thirdparty/zstd/compress/zstd_compress_literals.h b/thirdparty/zstd/compress/zstd_compress_literals.h index 9904c0cd3..80a598dd4 100644 --- a/thirdparty/zstd/compress/zstd_compress_literals.h +++ b/thirdparty/zstd/compress/zstd_compress_literals.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_COMPRESS_LITERALS_H +#define ZSTD_COMPRESS_LITERALS_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_COMPRESS_LITERALS_H -#define ZSTD_COMPRESS_LITERALS_H + + #include "zstd_compress_internal.h" /* ZSTD_hufCTables_t, ZSTD_minGain() */ diff --git a/thirdparty/zstd/compress/zstd_compress_sequences.h b/thirdparty/zstd/compress/zstd_compress_sequences.h index 7991364c2..1740213da 100644 --- a/thirdparty/zstd/compress/zstd_compress_sequences.h +++ b/thirdparty/zstd/compress/zstd_compress_sequences.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_COMPRESS_SEQUENCES_H +#define ZSTD_COMPRESS_SEQUENCES_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_COMPRESS_SEQUENCES_H -#define ZSTD_COMPRESS_SEQUENCES_H + + #include "../common/fse.h" /* FSE_repeat, FSE_CTable */ #include "../common/zstd_internal.h" /* symbolEncodingType_e, ZSTD_strategy */ diff --git a/thirdparty/zstd/compress/zstd_compress_superblock.h b/thirdparty/zstd/compress/zstd_compress_superblock.h index 176f9b106..48bcfcedc 100644 --- a/thirdparty/zstd/compress/zstd_compress_superblock.h +++ b/thirdparty/zstd/compress/zstd_compress_superblock.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_COMPRESS_ADVANCED_H +#define ZSTD_COMPRESS_ADVANCED_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_COMPRESS_ADVANCED_H -#define ZSTD_COMPRESS_ADVANCED_H + + /*-************************************* * Dependencies diff --git a/thirdparty/zstd/compress/zstd_cwksp.h b/thirdparty/zstd/compress/zstd_cwksp.h index 2656d26ca..33b8f2745 100644 --- a/thirdparty/zstd/compress/zstd_cwksp.h +++ b/thirdparty/zstd/compress/zstd_cwksp.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_CWKSP_H +#define ZSTD_CWKSP_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_CWKSP_H -#define ZSTD_CWKSP_H + + /*-************************************* * Dependencies diff --git a/thirdparty/zstd/compress/zstd_double_fast.h b/thirdparty/zstd/compress/zstd_double_fast.h index e16b7b03a..859ff385d 100644 --- a/thirdparty/zstd/compress/zstd_double_fast.h +++ b/thirdparty/zstd/compress/zstd_double_fast.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_DOUBLE_FAST_H +#define ZSTD_DOUBLE_FAST_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_DOUBLE_FAST_H -#define ZSTD_DOUBLE_FAST_H + + #if defined (__cplusplus) extern "C" { diff --git a/thirdparty/zstd/compress/zstd_fast.h b/thirdparty/zstd/compress/zstd_fast.h index 0d4a0c109..f6006e9ca 100644 --- a/thirdparty/zstd/compress/zstd_fast.h +++ b/thirdparty/zstd/compress/zstd_fast.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_FAST_H +#define ZSTD_FAST_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_FAST_H -#define ZSTD_FAST_H + + #if defined (__cplusplus) extern "C" { diff --git a/thirdparty/zstd/compress/zstd_lazy.h b/thirdparty/zstd/compress/zstd_lazy.h index 150f7b390..c4a1ed7f8 100644 --- a/thirdparty/zstd/compress/zstd_lazy.h +++ b/thirdparty/zstd/compress/zstd_lazy.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_LAZY_H +#define ZSTD_LAZY_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_LAZY_H -#define ZSTD_LAZY_H + + #if defined (__cplusplus) extern "C" { diff --git a/thirdparty/zstd/compress/zstd_ldm.h b/thirdparty/zstd/compress/zstd_ldm.h index 393466fa9..e2baae25d 100644 --- a/thirdparty/zstd/compress/zstd_ldm.h +++ b/thirdparty/zstd/compress/zstd_ldm.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_LDM_H +#define ZSTD_LDM_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_LDM_H -#define ZSTD_LDM_H + + #if defined (__cplusplus) extern "C" { diff --git a/thirdparty/zstd/compress/zstd_ldm_geartab.h b/thirdparty/zstd/compress/zstd_ldm_geartab.h index e5c24d856..5426c8212 100644 --- a/thirdparty/zstd/compress/zstd_ldm_geartab.h +++ b/thirdparty/zstd/compress/zstd_ldm_geartab.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_LDM_GEARTAB_H +#define ZSTD_LDM_GEARTAB_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_LDM_GEARTAB_H -#define ZSTD_LDM_GEARTAB_H + + static U64 ZSTD_ldm_gearTab[256] = { 0xf5b8f72c5f77775c, 0x84935f266b7ac412, 0xb647ada9ca730ccc, diff --git a/thirdparty/zstd/compress/zstd_opt.h b/thirdparty/zstd/compress/zstd_opt.h index 627255f53..7270a3d11 100644 --- a/thirdparty/zstd/compress/zstd_opt.h +++ b/thirdparty/zstd/compress/zstd_opt.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_OPT_H +#define ZSTD_OPT_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_OPT_H -#define ZSTD_OPT_H + + #if defined (__cplusplus) extern "C" { diff --git a/thirdparty/zstd/compress/zstdmt_compress.h b/thirdparty/zstd/compress/zstdmt_compress.h index 2fee2ec74..b7a256ba8 100644 --- a/thirdparty/zstd/compress/zstdmt_compress.h +++ b/thirdparty/zstd/compress/zstdmt_compress.h @@ -1,3 +1,5 @@ + #ifndef ZSTDMT_COMPRESS_H + #define ZSTDMT_COMPRESS_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ - #ifndef ZSTDMT_COMPRESS_H - #define ZSTDMT_COMPRESS_H + + #if defined (__cplusplus) extern "C" { diff --git a/thirdparty/zstd/decompress/zstd_ddict.h b/thirdparty/zstd/decompress/zstd_ddict.h index bd03268b5..876cda32d 100644 --- a/thirdparty/zstd/decompress/zstd_ddict.h +++ b/thirdparty/zstd/decompress/zstd_ddict.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_DDICT_H +#define ZSTD_DDICT_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -9,8 +11,8 @@ */ -#ifndef ZSTD_DDICT_H -#define ZSTD_DDICT_H + + /*-******************************************************* * Dependencies diff --git a/thirdparty/zstd/decompress/zstd_decompress_block.h b/thirdparty/zstd/decompress/zstd_decompress_block.h index 049a0cd84..8c6d590f4 100644 --- a/thirdparty/zstd/decompress/zstd_decompress_block.h +++ b/thirdparty/zstd/decompress/zstd_decompress_block.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_DEC_BLOCK_H +#define ZSTD_DEC_BLOCK_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -9,8 +11,8 @@ */ -#ifndef ZSTD_DEC_BLOCK_H -#define ZSTD_DEC_BLOCK_H + + /*-******************************************************* * Dependencies diff --git a/thirdparty/zstd/decompress/zstd_decompress_internal.h b/thirdparty/zstd/decompress/zstd_decompress_internal.h index ebda0c903..ea5cf735b 100644 --- a/thirdparty/zstd/decompress/zstd_decompress_internal.h +++ b/thirdparty/zstd/decompress/zstd_decompress_internal.h @@ -1,3 +1,5 @@ + #ifndef ZSTD_DECOMPRESS_INTERNAL_H + #define ZSTD_DECOMPRESS_INTERNAL_H /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -12,8 +14,8 @@ /* zstd_decompress_internal: * objects and definitions shared within lib/decompress modules */ - #ifndef ZSTD_DECOMPRESS_INTERNAL_H - #define ZSTD_DECOMPRESS_INTERNAL_H + + /*-******************************************************* diff --git a/thirdparty/zstd/zstd.h b/thirdparty/zstd/zstd.h index 4651e6c4d..b2079fcaa 100644 --- a/thirdparty/zstd/zstd.h +++ b/thirdparty/zstd/zstd.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_H_235446 +#define ZSTD_H_235446 /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -11,8 +13,8 @@ extern "C" { #endif -#ifndef ZSTD_H_235446 -#define ZSTD_H_235446 + + /* ====== Dependency ======*/ #include /* INT_MAX */ diff --git a/thirdparty/zstd/zstd_errors.h b/thirdparty/zstd/zstd_errors.h index fa3686b77..bd88812c8 100644 --- a/thirdparty/zstd/zstd_errors.h +++ b/thirdparty/zstd/zstd_errors.h @@ -1,3 +1,5 @@ +#ifndef ZSTD_ERRORS_H_398273423 +#define ZSTD_ERRORS_H_398273423 /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. @@ -8,8 +10,8 @@ * You may select, at your option, one of the above-listed licenses. */ -#ifndef ZSTD_ERRORS_H_398273423 -#define ZSTD_ERRORS_H_398273423 + + #if defined (__cplusplus) extern "C" {