net: Move include files outside of extern "C" block

This is related to findings in #17997 and changes network related
header files to have include files outside of extern "C" { } block.

Declarations that use C linkage should be placed within extern "C"
so the language linkage is correct when the header is included by
a C++ compiler.

Similarly #include directives should be outside the extern "C" to
ensure the language-specific default linkage is applied to any
declarations provided by the included header.

See: https://en.cppreference.com/w/cpp/language/language_linkage

Signed-off-by: Jukka Rissanen <[email protected]>

Author: jukkar

drivers/wifi/simplelink/simplelink_log.h

@@ -7,17 +7,9 @@
 #ifndef ZEPHYR_DRIVERS_WIFI_SIMPLELINK_SIMPLELINK_LOG_H_
 #define ZEPHYR_DRIVERS_WIFI_SIMPLELINK_SIMPLELINK_LOG_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define LOG_MODULE_NAME wifi_simplelink
 #define LOG_LEVEL CONFIG_WIFI_LOG_LEVEL
 
 #include <logging/log.h>
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* ZEPHYR_DRIVERS_WIFI_SIMPLELINK_SIMPLELINK_LOG_H_ */

drivers/wifi/simplelink/simplelink_support.h

@@ -8,12 +8,12 @@
 #ifndef ZEPHYR_DRIVERS_WIFI_SIMPLELINK_SIMPLELINK_SUPPORT_H_
 #define ZEPHYR_DRIVERS_WIFI_SIMPLELINK_SIMPLELINK_SUPPORT_H_
 
+#include <net/wifi_mgmt.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <net/wifi_mgmt.h>
-
 #define SSID_LEN_MAX	 (32)
 #define BSSID_LEN_MAX	 (6)
 

include/net/dhcpv4.h

@@ -11,6 +11,9 @@
 #ifndef ZEPHYR_INCLUDE_NET_DHCPV4_H_
 #define ZEPHYR_INCLUDE_NET_DHCPV4_H_
 
+#include <sys/slist.h>
+#include <zephyr/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -22,9 +25,6 @@ extern "C" {
  * @{
  */
 
-#include <sys/slist.h>
-#include <zephyr/types.h>
-
 /** @cond INTERNAL_HIDDEN */
 
 /** Current state of DHCPv4 client address negotiation.

include/net/http_parser.h

@@ -20,9 +20,6 @@
  */
 #ifndef ZEPHYR_INCLUDE_NET_HTTP_PARSER_H_
 #define ZEPHYR_INCLUDE_NET_HTTP_PARSER_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /* Also update SONAME in the Makefile whenever you change these. */
 #define HTTP_PARSER_VERSION_MAJOR 2
@@ -49,6 +46,10 @@ typedef unsigned __int64 u64_t;
 #include <net/http_parser_state.h>
 #include <net/http_parser_url.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Maximium header size allowed. If the macro is not defined
  * before including this header then the default is used. To
  * change the maximum header size, define the macro in the build

include/net/http_parser_url.h

@@ -20,15 +20,16 @@
  */
 #ifndef ZEPHYR_INCLUDE_NET_HTTP_PARSER_URL_H_
 #define ZEPHYR_INCLUDE_NET_HTTP_PARSER_URL_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #include <sys/types.h>
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <net/http_parser_state.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum http_parser_url_fields {
 	  UF_SCHEMA           = 0
 	, UF_HOST             = 1

include/net/net_core.h

@@ -13,12 +13,12 @@
 #ifndef ZEPHYR_INCLUDE_NET_NET_CORE_H_
 #define ZEPHYR_INCLUDE_NET_NET_CORE_H_
 
+#include <stdbool.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdbool.h>
-
 /**
  * @brief Networking
  * @defgroup networking Networking

include/net/net_event.h

@@ -12,12 +12,12 @@
 #ifndef ZEPHYR_INCLUDE_NET_NET_EVENT_H_
 #define ZEPHYR_INCLUDE_NET_NET_EVENT_H_
 
+#include <net/net_ip.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <net/net_ip.h>
-
 /**
  * @addtogroup net_mgmt
  * @{

include/net/net_mgmt.h

@@ -12,6 +12,9 @@
 #ifndef ZEPHYR_INCLUDE_NET_NET_MGMT_H_
 #define ZEPHYR_INCLUDE_NET_NET_MGMT_H_
 
+#include <sys/__assert.h>
+#include <net/net_core.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -23,9 +26,6 @@ extern "C" {
  * @{
  */
 
-#include <sys/__assert.h>
-#include <net/net_core.h>
-
 struct net_if;
 
 /** @cond INTERNAL_HIDDEN */

include/net/socket_can.h

@@ -13,15 +13,15 @@
 #ifndef ZEPHYR_INCLUDE_NET_SOCKET_CAN_H_
 #define ZEPHYR_INCLUDE_NET_SOCKET_CAN_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <zephyr/types.h>
 #include <net/net_ip.h>
 #include <net/net_if.h>
 #include <drivers/can.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Socket CAN library
  * @defgroup socket_can Network Core Library

include/net/socket_net_mgmt.h

@@ -13,15 +13,15 @@
 #ifndef ZEPHYR_INCLUDE_NET_SOCKET_NET_MGMT_H_
 #define ZEPHYR_INCLUDE_NET_SOCKET_NET_MGMT_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <zephyr/types.h>
 #include <net/net_ip.h>
 #include <net/net_if.h>
 #include <net/net_mgmt.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Socket NET_MGMT library
  * @defgroup socket_net_mgmt Network Core Library