fix(net): Use typedefs instead to help with forward declarations

Defines do not allow forward declarations
espressif · Jun 20, 2024 · d9b88b6 · d9b88b6
1 parent 8f13096
commit d9b88b6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 16 deletions.
diff --git a/libraries/NetworkClientSecure/src/WiFiClientSecure.h b/libraries/NetworkClientSecure/src/WiFiClientSecure.h
@@ -1,4 +1,3 @@
 #pragma once
-#warning WiFiClientSecure has been deprecated, please use NetworkClientSecure instead.
 #include "NetworkClientSecure.h"
-#define WiFiClientSecure NetworkClientSecure
+typedef NetworkClientSecure WiFiClientSecure;
diff --git a/libraries/WiFi/src/WiFi.h b/libraries/WiFi/src/WiFi.h
@@ -35,14 +35,9 @@
 #include "WiFiScan.h"
 #include "WiFiGeneric.h"
 
-#include "NetworkClient.h"
-#include "NetworkServer.h"
-#include "NetworkUdp.h"
-//defines are added here not to cause warnings
-//to be removed in the future
-#define WiFiClient NetworkClient
-#define WiFiServer NetworkServer
-#define WiFiUDP NetworkUDP
+#include "WiFiClient.h"
+#include "WiFiServer.h"
+#include "WiFiUdp.h"
 
 class WiFiClass : public WiFiGenericClass, public WiFiSTAClass, public WiFiScanClass, public WiFiAPClass {
 private:

diff --git a/libraries/WiFi/src/WiFiClient.h b/libraries/WiFi/src/WiFiClient.h
@@ -1,4 +1,3 @@
 #pragma once
-#warning WiFiClient has been deprecated, please use NetworkClient instead.
 #include "NetworkClient.h"
-#define WiFiClient NetworkClient
+typedef NetworkClient WiFiClient;
diff --git a/libraries/WiFi/src/WiFiServer.h b/libraries/WiFi/src/WiFiServer.h
@@ -1,4 +1,3 @@
 #pragma once
-#warning WiFiServer has been deprecated, please use NetworkServer instead.
 #include "NetworkServer.h"
-#define WiFiServer NetworkServer
+typedef NetworkServer WiFiServer;
diff --git a/libraries/WiFi/src/WiFiUdp.h b/libraries/WiFi/src/WiFiUdp.h
@@ -1,4 +1,3 @@
 #pragma once
-#warning WiFiUDP has been deprecated, please use NetworkUDP instead.
 #include "NetworkUdp.h"
-#define WiFiUDP NetworkUDP
+typedef NetworkUDP WiFiUDP;