mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-03-20 19:21:09 +01:00
Remove Everest VS2010 compatibility headers
These headers were necessary for compatibility with Visual Studio 2010, and interfere with the system headers on Visual Studio 2013+, eg. when building Mbed TLS using the .sln file shipped with the project. Move the still-required definition of "inline" to callconv.h, where the definition for GCC also lives. Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
This commit is contained in:
@@ -7,6 +7,8 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
|
|
||||||
|
#include "kremlin/internal/callconv.h"
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
/* Implementing C.fst (part 2: endian-ness macros) */
|
/* Implementing C.fst (part 2: endian-ness macros) */
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|||||||
@@ -27,8 +27,10 @@
|
|||||||
/* Since KreMLin emits the inline keyword unconditionally, we follow the
|
/* Since KreMLin emits the inline keyword unconditionally, we follow the
|
||||||
* guidelines at https://gcc.gnu.org/onlinedocs/gcc/Inline.html and make this
|
* guidelines at https://gcc.gnu.org/onlinedocs/gcc/Inline.html and make this
|
||||||
* __inline__ to ensure the code compiles with -std=c90 and earlier. */
|
* __inline__ to ensure the code compiles with -std=c90 and earlier. */
|
||||||
#ifdef __GNUC__
|
#if defined(__GNUC__)
|
||||||
# define inline __inline__
|
# define inline __inline__
|
||||||
|
#elif defined(_MSC_VER)
|
||||||
|
# define inline __inline
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* GCC-specific attribute syntax; everyone else gets the standard C inline
|
/* GCC-specific attribute syntax; everyone else gets the standard C inline
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
/*
|
|
||||||
* Custom inttypes.h for VS2010 KreMLin requires these definitions,
|
|
||||||
* but VS2010 doesn't provide them.
|
|
||||||
*
|
|
||||||
* Copyright 2016-2018 INRIA and Microsoft Corporation
|
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
* not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
* This file is part of Mbed TLS (https://tls.mbed.org)
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _INTTYPES_H_VS2010
|
|
||||||
#define _INTTYPES_H_VS2010
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#define inline __inline
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* VS2010 unsigned long == 8 bytes */
|
|
||||||
|
|
||||||
#define PRIu64 "I64u"
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
/*
|
|
||||||
* Custom stdbool.h for VS2010 KreMLin requires these definitions,
|
|
||||||
* but VS2010 doesn't provide them.
|
|
||||||
*
|
|
||||||
* Copyright 2016-2018 INRIA and Microsoft Corporation
|
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
* not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
* This file is part of Mbed TLS (https://tls.mbed.org)
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _STDBOOL_H_VS2010
|
|
||||||
#define _STDBOOL_H_VS2010
|
|
||||||
|
|
||||||
typedef int bool;
|
|
||||||
|
|
||||||
static bool true = 1;
|
|
||||||
static bool false = 0;
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -3,3 +3,6 @@ Bugfix
|
|||||||
occurred whenever SSL debugging was enabled on a copy of Mbed TLS built
|
occurred whenever SSL debugging was enabled on a copy of Mbed TLS built
|
||||||
with Visual Studio 2013.
|
with Visual Studio 2013.
|
||||||
Fixes #10017.
|
Fixes #10017.
|
||||||
|
* Remove Everest Visual Studio 2010 compatibility headers, which could
|
||||||
|
interfere with standard CRT headers in certain situations, eg. when
|
||||||
|
building Mbed TLS with the .sln file shipped with the project.
|
||||||
|
|||||||
Reference in New Issue
Block a user