Skip to content

Commit f99b965

Browse files
Merge branch 'bugfix/ifdef_cplusplus_bracket' into 'master'
bugfix(wifi): Add missing brackets in the C++ guard Closes IDFGH-14192 See merge request espressif/esp-idf!35498
2 parents 7bb6c67 + e532499 commit f99b965

File tree

7 files changed

+19
-2
lines changed

7 files changed

+19
-2
lines changed

components/bt/common/osi/include/osi/fixed_pkt_queue.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,8 @@ void fixed_pkt_queue_unregister_dequeue(fixed_pkt_queue_t *queue);
7676

7777
void fixed_pkt_queue_process(fixed_pkt_queue_t *queue);
7878

79+
#ifdef __cplusplus
80+
}
81+
#endif
82+
7983
#endif

components/bt/host/bluedroid/bta/include/bta/bta_ar_api.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
/******************************************************************************
2020
*
21-
* This is the public interface file for the simulatenous advanced
21+
* This is the public interface file for the simultaneous advanced
2222
* audio/video streaming (AV) source and sink of BTA, Broadcom's Bluetooth
2323
* application layer for mobile phones.
2424
*
@@ -35,6 +35,10 @@
3535

3636
#if (BTA_AR_INCLUDED == TRUE)
3737

38+
#ifdef __cplusplus
39+
extern "C" {
40+
#endif
41+
3842
/*****************************************************************************
3943
** Constants and data types
4044
*****************************************************************************/

components/bt/host/bluedroid/btc/profile/std/include/btc_av_api.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
#include "stack/a2d_sbc.h"
2424

2525
#if (BTC_AV_INCLUDED == TRUE)
26+
#ifdef __cplusplus
27+
extern "C" {
28+
#endif
2629
/*****************************************************************************
2730
** Constants and data types
2831
*****************************************************************************/

components/wpa_supplicant/esp_supplicant/include/esp_mbo.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#define _ESP_MBO_H
99

1010
#include <stdbool.h>
11+
#include <stdint.h>
12+
#include <stddef.h>
1113
#ifdef __cplusplus
1214
extern "C" {
1315
#endif

components/wpa_supplicant/esp_supplicant/include/esp_rrm.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#define _ESP_RRM_H
99

1010
#include <stdbool.h>
11+
#include <stdint.h>
12+
#include <stddef.h>
1113
#ifdef __cplusplus
1214
extern "C" {
1315
#endif

components/wpa_supplicant/esp_supplicant/include/esp_wpa2.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
#pragma message("esp_wpa2.h is deprecated. Use esp_eap_client.h instead.")
1111

1212
#include "esp_eap_client.h"
13+
#ifdef __cplusplus
14+
extern "C" {
15+
#endif
1316

1417
/**
1518
* @brief Enable wpa2 enterprise authentication.

tools/ci/check_public_headers_exceptions.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ components/spi_flash/include/spi_flash_chip_generic.h
4040

4141
components/wpa_supplicant/include/
4242
components/wpa_supplicant/port/
43-
components/wpa_supplicant/esp_supplicant/include/
4443

4544
components/mbedtls/mbedtls/
4645
components/mbedtls/port/include/

0 commit comments

Comments
 (0)