From e4ed53d4120d7e0a543ca1080f8ee71d13e7051e Mon Sep 17 00:00:00 2001
From: akshat <akshat.agrawal@espressif.com>
Date: Tue, 11 Feb 2025 10:26:07 +0530
Subject: [PATCH 1/2] bugfix(wifi): Add missing brackets in the C++ guard

Closes https://github.com/espressif/esp-idf/issues/14991
---
 components/bt/common/osi/include/osi/fixed_pkt_queue.h      | 4 ++++
 components/bt/host/bluedroid/bta/include/bta/bta_ar_api.h   | 6 +++++-
 .../bt/host/bluedroid/btc/profile/std/include/btc_av_api.h  | 3 +++
 components/wpa_supplicant/esp_supplicant/include/esp_wpa2.h | 3 +++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/components/bt/common/osi/include/osi/fixed_pkt_queue.h b/components/bt/common/osi/include/osi/fixed_pkt_queue.h
index f4235ca5d9..e121235eda 100644
--- a/components/bt/common/osi/include/osi/fixed_pkt_queue.h
+++ b/components/bt/common/osi/include/osi/fixed_pkt_queue.h
@@ -76,4 +76,8 @@ void fixed_pkt_queue_unregister_dequeue(fixed_pkt_queue_t *queue);
 
 void fixed_pkt_queue_process(fixed_pkt_queue_t *queue);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/bt/host/bluedroid/bta/include/bta/bta_ar_api.h b/components/bt/host/bluedroid/bta/include/bta/bta_ar_api.h
index 2823d674e5..20f1128119 100644
--- a/components/bt/host/bluedroid/bta/include/bta/bta_ar_api.h
+++ b/components/bt/host/bluedroid/bta/include/bta/bta_ar_api.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************
  *
- *  This is the public interface file for the simulatenous advanced
+ *  This is the public interface file for the simultaneous advanced
  *  audio/video streaming (AV) source and sink of BTA, Broadcom's Bluetooth
  *  application layer for mobile phones.
  *
@@ -35,6 +35,10 @@
 
 #if (BTA_AR_INCLUDED == TRUE)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*****************************************************************************
 **  Constants and data types
 *****************************************************************************/
diff --git a/components/bt/host/bluedroid/btc/profile/std/include/btc_av_api.h b/components/bt/host/bluedroid/btc/profile/std/include/btc_av_api.h
index 72ee3bb714..57d14fbf2d 100644
--- a/components/bt/host/bluedroid/btc/profile/std/include/btc_av_api.h
+++ b/components/bt/host/bluedroid/btc/profile/std/include/btc_av_api.h
@@ -23,6 +23,9 @@
 #include "stack/a2d_sbc.h"
 
 #if (BTC_AV_INCLUDED == TRUE)
+#ifdef __cplusplus
+extern "C" {
+#endif
 /*****************************************************************************
  **  Constants and data types
  *****************************************************************************/
diff --git a/components/wpa_supplicant/esp_supplicant/include/esp_wpa2.h b/components/wpa_supplicant/esp_supplicant/include/esp_wpa2.h
index 3f3b78934f..1a46bdd4b6 100644
--- a/components/wpa_supplicant/esp_supplicant/include/esp_wpa2.h
+++ b/components/wpa_supplicant/esp_supplicant/include/esp_wpa2.h
@@ -10,6 +10,9 @@
 #pragma message("esp_wpa2.h is deprecated. Use esp_eap_client.h instead.")
 
 #include "esp_eap_client.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /**
   * @brief  Enable wpa2 enterprise authentication.

From 9186cf432a92384e8c0ab18d514291e8b92ff297 Mon Sep 17 00:00:00 2001
From: akshat <akshat.agrawal@espressif.com>
Date: Tue, 11 Feb 2025 10:28:06 +0530
Subject: [PATCH 2/2] bugfix(wifi): Fix header file errors and remove
 esp_supplicant from check_public_headers_exceptions.txt

---
 components/wpa_supplicant/esp_supplicant/include/esp_mbo.h | 2 ++
 components/wpa_supplicant/esp_supplicant/include/esp_rrm.h | 2 ++
 tools/ci/check_public_headers_exceptions.txt               | 1 -
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/wpa_supplicant/esp_supplicant/include/esp_mbo.h b/components/wpa_supplicant/esp_supplicant/include/esp_mbo.h
index 4319ecc000..4e2cba45f0 100644
--- a/components/wpa_supplicant/esp_supplicant/include/esp_mbo.h
+++ b/components/wpa_supplicant/esp_supplicant/include/esp_mbo.h
@@ -8,6 +8,8 @@
 #define _ESP_MBO_H
 
 #include <stdbool.h>
+#include <stdint.h>
+#include <stddef.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/wpa_supplicant/esp_supplicant/include/esp_rrm.h b/components/wpa_supplicant/esp_supplicant/include/esp_rrm.h
index fa40e0cd62..ad7428040d 100644
--- a/components/wpa_supplicant/esp_supplicant/include/esp_rrm.h
+++ b/components/wpa_supplicant/esp_supplicant/include/esp_rrm.h
@@ -8,6 +8,8 @@
 #define _ESP_RRM_H
 
 #include <stdbool.h>
+#include <stdint.h>
+#include <stddef.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt
index 7916463792..07bfca9f67 100644
--- a/tools/ci/check_public_headers_exceptions.txt
+++ b/tools/ci/check_public_headers_exceptions.txt
@@ -52,7 +52,6 @@ components/bootloader_support/include/esp_app_format.h
 
 components/wpa_supplicant/include/
 components/wpa_supplicant/port/
-components/wpa_supplicant/esp_supplicant/include/
 
 components/mbedtls/mbedtls/
 components/mbedtls/port/include/