Kaynağa Gözat

Merge branch 'bugfix/cxx_flag_operators_v4.1' into 'release/v4.1'

esp_eth: moved extern "C" after includes (v4.1)

See merge request espressif/esp-idf!10352
Angus Gratton 5 yıl önce
ebeveyn
işleme
94cb7e8b8f

+ 4 - 4
components/esp_eth/include/esp_eth.h

@@ -13,14 +13,14 @@
 // limitations under the License.
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "esp_eth_com.h"
 #include "esp_eth_mac.h"
 #include "esp_eth_phy.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
 * @brief Handle of Ethernet driver
 *

+ 3 - 3
components/esp_eth/include/esp_eth_com.h

@@ -13,13 +13,13 @@
 // limitations under the License.
 #pragma once
 
+#include "esp_err.h"
+#include "esp_event_base.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "esp_err.h"
-#include "esp_event_base.h"
-
 /**
  * @brief Maximum Ethernet payload size
  *

+ 4 - 4
components/esp_eth/include/esp_eth_mac.h

@@ -13,10 +13,6 @@
 // limitations under the License.
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdbool.h>
 #include "esp_eth_com.h"
 #include "sdkconfig.h"
@@ -24,6 +20,10 @@ extern "C" {
 #include "driver/spi_master.h"
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
 * @brief Ethernet MAC
 *

+ 2 - 2
components/esp_eth/include/esp_eth_netif_glue.h

@@ -13,12 +13,12 @@
 // limitations under the License.
 #pragma once
 
+#include "esp_eth.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "esp_eth.h"
-
 /**
  * @brief Create a netif glue for Ethernet driver
  * @note netif glue is used to attach io driver to TCP/IP netif

+ 4 - 4
components/esp_eth/include/esp_eth_phy.h

@@ -13,14 +13,14 @@
 // limitations under the License.
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdbool.h>
 #include "esp_eth_com.h"
 #include "sdkconfig.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define ESP_ETH_PHY_ADDR_AUTO (-1)
 
 /**

+ 2 - 2
components/esp_eth/include/eth_phy_regs_struct.h

@@ -13,12 +13,12 @@
 // limitations under the License.
 #pragma once
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdint.h>
-
 /******************Basic PHY Registers*******************/
 
 /**