[utils] remove stdint and stdbool wrappers (#4154)

This commit removes the wrap_stdint.h and wrap_stdbool.h because
OpenThread enforces C99, which includes these headers in its standard
library.

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)
 

src/core/common/code_utils.hpp

@@ -36,8 +36,9 @@
 
 #include "openthread-core-config.h"
 
+#include <stdbool.h>
+
 #include "utils/static_assert.hpp"
-#include "utils/wrap_stdbool.h"
 
 /**
  * This macro calculates the number of elements in an array.

src/core/common/extension_example.cpp

@@ -33,12 +33,12 @@
 
 #include "openthread-core-config.h"
 
+#include <stdbool.h>
 #include <stdint.h>
 
 #include "common/code_utils.hpp"
 #include "common/extension.hpp"
 #include "common/new.hpp"
-#include "utils/wrap_stdbool.h"
 
 namespace ot {
 namespace Extension {

src/core/common/instance.hpp

@@ -36,10 +36,9 @@
 
 #include "openthread-core-config.h"
 
+#include <stdbool.h>
 #include <stdint.h>
 
-#include "utils/wrap_stdbool.h"
-
 #include <openthread/error.h>
 #include <openthread/heap.h>
 #include <openthread/platform/logging.h>

src/core/common/notifier.hpp

@@ -36,10 +36,9 @@
 
 #include "openthread-core-config.h"
 
+#include <stdbool.h>
 #include <stdint.h>
 
-#include "utils/wrap_stdbool.h"
-
 #include <openthread/instance.h>
 #include <openthread/platform/toolchain.h>
 

src/core/common/random.hpp

@@ -36,11 +36,12 @@
 
 #include "openthread-core-config.h"
 
+#include <stdint.h>
+
 #include <openthread/error.h>
 
 #include "common/debug.hpp"
 #include "common/random_manager.hpp"
-#include "utils/wrap_stdint.h"
 
 namespace ot {
 namespace Random {

src/core/common/random_manager.hpp

@@ -36,6 +36,7 @@
 
 #include "openthread-core-config.h"
 
+#include <stdint.h>
 #include <openthread/error.h>
 
 #ifndef OPENTHREAD_RADIO
@@ -43,8 +44,6 @@
 #include <mbedtls/entropy.h>
 #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

src/core/crypto/pbkdf2_cmac.h

@@ -37,10 +37,9 @@
 
 #include "openthread-core-config.h"
 
+#include <stdbool.h>
 #include <stdint.h>
 
-#include "utils/wrap_stdbool.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

src/core/thread/device_mode.hpp

@@ -36,10 +36,11 @@
 
 #include "openthread-core-config.h"
 
+#include <stdint.h>
+
 #include <openthread/thread.h>
 
 #include "common/string.hpp"
-#include "utils/wrap_stdint.h"
 
 namespace ot {
 namespace Mle {

src/core/thread/indirect_sender_frame_context.hpp

@@ -36,7 +36,7 @@
 
 #include "openthread-core-config.h"
 
-#include "utils/wrap_stdint.h"
+#include <stdint.h>
 
 namespace ot {
 

src/core/utils/wrap_stdbool.h

@@ -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 <stdbool.h>
-#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

src/core/utils/wrap_stdint.h

@@ -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 <stdint.h>
-
-#endif // WRAP_STDINT_H

src/ncp/spinel_platform.h

@@ -52,11 +52,11 @@
 #include "openthread-core-config.h"
 
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "utils/wrap_stdbool.h"
 #include "utils/wrap_string.h"
 
 #endif // SPINEL_PLATFORM_OPENTHREAD_H_