diff --git a/src/core/Makefile.am b/src/core/Makefile.am index cfcf259c8..85f1b9f36 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -435,8 +435,6 @@ HEADERS_COMMON = \ utils/parse_cmdline.hpp \ utils/slaac_address.hpp \ utils/static_assert.hpp \ - utils/wrap_stdbool.h \ - utils/wrap_stdint.h \ utils/wrap_string.h \ $(NULL) diff --git a/src/core/common/code_utils.hpp b/src/core/common/code_utils.hpp index 2c32aca60..1751190bc 100644 --- a/src/core/common/code_utils.hpp +++ b/src/core/common/code_utils.hpp @@ -36,8 +36,9 @@ #include "openthread-core-config.h" +#include + #include "utils/static_assert.hpp" -#include "utils/wrap_stdbool.h" /** * This macro calculates the number of elements in an array. diff --git a/src/core/common/extension_example.cpp b/src/core/common/extension_example.cpp index 82e8bc079..15c13a888 100644 --- a/src/core/common/extension_example.cpp +++ b/src/core/common/extension_example.cpp @@ -33,12 +33,12 @@ #include "openthread-core-config.h" +#include #include #include "common/code_utils.hpp" #include "common/extension.hpp" #include "common/new.hpp" -#include "utils/wrap_stdbool.h" namespace ot { namespace Extension { diff --git a/src/core/common/instance.hpp b/src/core/common/instance.hpp index b522004a6..b173ba622 100644 --- a/src/core/common/instance.hpp +++ b/src/core/common/instance.hpp @@ -36,10 +36,9 @@ #include "openthread-core-config.h" +#include #include -#include "utils/wrap_stdbool.h" - #include #include #include diff --git a/src/core/common/notifier.hpp b/src/core/common/notifier.hpp index 580e8661c..b4a14a4f6 100644 --- a/src/core/common/notifier.hpp +++ b/src/core/common/notifier.hpp @@ -36,10 +36,9 @@ #include "openthread-core-config.h" +#include #include -#include "utils/wrap_stdbool.h" - #include #include diff --git a/src/core/common/random.hpp b/src/core/common/random.hpp index 71c742def..7ed702265 100644 --- a/src/core/common/random.hpp +++ b/src/core/common/random.hpp @@ -36,11 +36,12 @@ #include "openthread-core-config.h" +#include + #include #include "common/debug.hpp" #include "common/random_manager.hpp" -#include "utils/wrap_stdint.h" namespace ot { namespace Random { diff --git a/src/core/common/random_manager.hpp b/src/core/common/random_manager.hpp index b586b9eaf..d9cfe0ef6 100644 --- a/src/core/common/random_manager.hpp +++ b/src/core/common/random_manager.hpp @@ -36,6 +36,7 @@ #include "openthread-core-config.h" +#include #include #ifndef OPENTHREAD_RADIO @@ -43,8 +44,6 @@ #include #endif -#include "utils/wrap_stdint.h" - #if (!defined(MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES) && \ (!defined(MBEDTLS_NO_PLATFORM_ENTROPY) || defined(MBEDTLS_HAVEGE_C) || defined(MBEDTLS_ENTROPY_HARDWARE_ALT))) #define OT_MBEDTLS_STRONG_DEFAULT_ENTROPY_PRESENT diff --git a/src/core/crypto/pbkdf2_cmac.h b/src/core/crypto/pbkdf2_cmac.h index 15cb60c6f..fffb5baf7 100644 --- a/src/core/crypto/pbkdf2_cmac.h +++ b/src/core/crypto/pbkdf2_cmac.h @@ -37,10 +37,9 @@ #include "openthread-core-config.h" +#include #include -#include "utils/wrap_stdbool.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/src/core/thread/device_mode.hpp b/src/core/thread/device_mode.hpp index eb708acae..b68c99d4b 100644 --- a/src/core/thread/device_mode.hpp +++ b/src/core/thread/device_mode.hpp @@ -36,10 +36,11 @@ #include "openthread-core-config.h" +#include + #include #include "common/string.hpp" -#include "utils/wrap_stdint.h" namespace ot { namespace Mle { diff --git a/src/core/thread/indirect_sender_frame_context.hpp b/src/core/thread/indirect_sender_frame_context.hpp index 05266366f..3d61dd767 100644 --- a/src/core/thread/indirect_sender_frame_context.hpp +++ b/src/core/thread/indirect_sender_frame_context.hpp @@ -36,7 +36,7 @@ #include "openthread-core-config.h" -#include "utils/wrap_stdint.h" +#include namespace ot { diff --git a/src/core/utils/wrap_stdbool.h b/src/core/utils/wrap_stdbool.h deleted file mode 100644 index 8317f8518..000000000 --- a/src/core/utils/wrap_stdbool.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2017, The OpenThread Authors. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 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. - */ - -/** - * @file - * This file is a wrapper for the standard "string.h" file - * The purpose is add any missing function prototypes not - * provided by a specific compiler. - */ - -#if !defined(WRAP_STDBOOL_H) -#define WRAP_STDBOOL_H - -#include "openthread-core-config.h" - -#if HAVE_STDBOOL_H -#include -#else - -/* Supply our own */ -#if __cplusplus -/* c++ has a built in bool */ -#else - -#if !defined(__bool_true_false_are_defined) -#define __bool_true_false_are_defined 1 -#define false 0 -#define true 1 - -typedef _Bool bool; - -#endif // bool defined - -#endif // __cplusplus - -#endif // HAVE_STDBOOL_H - -#endif // WRAP_STDBOOL_H diff --git a/src/core/utils/wrap_stdint.h b/src/core/utils/wrap_stdint.h deleted file mode 100644 index 102adfcce..000000000 --- a/src/core/utils/wrap_stdint.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2016, The OpenThread Authors. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 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. - */ -#if !defined(WRAP_STDINT_H) -#define WRAP_STDINT_H - -#include "openthread-core-config.h" - -/* use the compiler supplied solution */ -#include - -#endif // WRAP_STDINT_H diff --git a/src/ncp/spinel_platform.h b/src/ncp/spinel_platform.h index 1468d1816..a791c8998 100644 --- a/src/ncp/spinel_platform.h +++ b/src/ncp/spinel_platform.h @@ -52,11 +52,11 @@ #include "openthread-core-config.h" #include +#include #include #include #include -#include "utils/wrap_stdbool.h" #include "utils/wrap_string.h" #endif // SPINEL_PLATFORM_OPENTHREAD_H_