Merge branch 'bugfix/https_server_cpp_support' into 'master'

esp_https_server : add extern C directive for C++ support

See merge request idf/esp-idf!4054
This commit is contained in:
Angus Gratton 2019-01-02 13:58:37 +08:00
commit 25ab173799

View File

@ -19,6 +19,10 @@
#include "esp_err.h"
#include "esp_http_server.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef enum {
HTTPD_SSL_TRANSPORT_SECURE, // SSL Enabled
HTTPD_SSL_TRANSPORT_INSECURE // SSL disabled
@ -92,6 +96,10 @@ typedef struct httpd_ssl_config httpd_ssl_config_t;
.open_fn = NULL, \
.close_fn = NULL, \
}, \
.cacert_pem = NULL, \
.cacert_len = 0, \
.prvtkey_pem = NULL, \
.prvtkey_len = 0, \
.transport_mode = HTTPD_SSL_TRANSPORT_SECURE, \
.port_secure = 443, \
.port_insecure = 80, \
@ -114,4 +122,8 @@ esp_err_t httpd_ssl_start(httpd_handle_t *handle, httpd_ssl_config_t *config);
*/
void httpd_ssl_stop(httpd_handle_t handle);
#ifdef __cplusplus
}
#endif
#endif // _ESP_HTTPS_SERVER_H_