mirror of
https://github.com/espressif/esp-mqtt.git
synced 2025-08-03 12:45:34 +02:00
Merge branch 'alwint3r-fix-typo-remove-deprecation'
This commit is contained in:
@@ -12,7 +12,3 @@ COMPONENT_ADD_INCLUDEDIRS := include
|
|||||||
COMPONENT_SRCDIRS := .
|
COMPONENT_SRCDIRS := .
|
||||||
#EXTRA_CFLAGS := -DICACHE_RODATA_ATTR
|
#EXTRA_CFLAGS := -DICACHE_RODATA_ATTR
|
||||||
CFLAGS += -Wno-error=implicit-function-declaration -Wno-error=format= -DHAVE_CONFIG_H
|
CFLAGS += -Wno-error=implicit-function-declaration -Wno-error=format= -DHAVE_CONFIG_H
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
include $(IDF_PATH)/make/component_common.mk
|
|
||||||
|
@@ -10,13 +10,13 @@
|
|||||||
#if defined(CONFIG_MQTT_SECURITY_ON) // ENABLE MQTT OVER SSL
|
#if defined(CONFIG_MQTT_SECURITY_ON) // ENABLE MQTT OVER SSL
|
||||||
#include "openssl/ssl.h"
|
#include "openssl/ssl.h"
|
||||||
|
|
||||||
#define ClientRead(buf,num) SSL_read(client->ssl, buf, num)
|
#define ClientRead(buf,num) SSL_read(client->ssl, buf, num)
|
||||||
#define ClientWrite(buf,num) SSL_write(client->ssl, buf, num)
|
#define ClientWrite(buf,num) SSL_write(client->ssl, buf, num)
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#define ClientRead(buf,num) read(client->socket, buf, num)
|
#define ClientRead(buf,num) read(client->socket, buf, num)
|
||||||
#define ClientWrite(buf,num) write(client->socket, buf, num)
|
#define ClientWrite(buf,num) write(client->socket, buf, num)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@@ -94,5 +94,5 @@ void mqtt_stop();
|
|||||||
void mqtt_task(void *pvParameters);
|
void mqtt_task(void *pvParameters);
|
||||||
void mqtt_subscribe(mqtt_client *client, const char *topic, uint8_t qos);
|
void mqtt_subscribe(mqtt_client *client, const char *topic, uint8_t qos);
|
||||||
void mqtt_publish(mqtt_client* client, const char *topic, const char *data, int len, int qos, int retain);
|
void mqtt_publish(mqtt_client* client, const char *topic, const char *data, int len, int qos, int retain);
|
||||||
void mqtt_detroy();
|
void mqtt_destroy();
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user