Fixes

cziter15 · Feb 16, 2025 · c47c805 · c47c805
1 parent da3f4e7
commit c47c805
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/src/ksf/comp/ksMqttConnector.h b/src/ksf/comp/ksMqttConnector.h
@@ -17,22 +17,26 @@
 #include "../misc/ksSimpleTimer.h"
 #include "../misc/ksDomainQuery.h"
 
-#if (defined(ESP32) && ESP_ARDUINO_VERSION_MAJOR >= 3)
-	#define ksMqttConnectorNetClient_t NetworkClient
-	#define ksMqttConnectorNetClientSecure_t NetworkClientSecure
-#elif defined (ESP8266)
+#if (defined(ESP32))
+	#if ESP_ARDUINO_VERSION_MAJOR >= 3
+		#define ksMqttConnectorNetClient_t NetworkClient
+		#define ksMqttConnectorNetClientSecure_t NetworkClientSecure
+	#else
+		#define ksMqttConnectorNetClient_t WiFiClient
+		#define ksMqttConnectorNetClientSecure_t WiFiClientSecure
+	#endif
+	class ksMqttConnectorNetClientSecure_t;
+	class ksMqttConnectorNetClient_t;
+#elif defined(ESP8266)
+	namespace BearSSL{class WiFiClientSecure;}
+	#define ksCertUtilsNetCLientSecure_t BearSSL::WiFiClientSecure
 	#define ksMqttConnectorNetClient_t WiFiClient
-	namespace BearSSL
-	{
-		class WiFiClientSecure;
-	}
-	#define ksMqttConnectorNetClientSecure_t BearSSL::WiFiClientSecure
+	class ksMqttConnectorNetClient_t;
 #else
 	#error Platform not implemented.
 #endif
 
 class PubSubClient;
-class ksMqttConnectorNetClient_t;
 
 namespace ksf::misc
 {

diff --git a/src/ksf/misc/ksCertUtils.h b/src/ksf/misc/ksCertUtils.h
@@ -12,14 +12,15 @@
 #include <string>
 #include <stdint.h>
 
-#if defined(ESP32)
-	#define ksCertUtilsNetCLientSecure_t WiFiClientSecure
+#if (defined(ESP32))
+	#if ESP_ARDUINO_VERSION_MAJOR >= 3
+		#define ksCertUtilsNetCLientSecure_t NetworkClientSecure
+	#else
+		#define ksCertUtilsNetCLientSecure_t WiFiClientSecure
+	#endif
 	class ksCertUtilsNetCLientSecure_t;
-#elif defined(ESP8266)
-	namespace BearSSL
-	{
-		class WiFiClientSecure;
-	}
+#elif defined(ESP8266)		
+	namespace BearSSL{class WiFiClientSecure;}
 	#define ksCertUtilsNetCLientSecure_t BearSSL::WiFiClientSecure
 #else
 	#error Platform not implemented.