From 4db69a3790c36d4b84066e0ab33c3519bd96cef2 Mon Sep 17 00:00:00 2001
From: Shawn A <spam@rumental.com>
Date: Thu, 25 Jan 2018 16:05:55 -0600
Subject: [PATCH] rework def WEBSERVERSHIM

testing libraries with esp8266 name or webserver
---
 WiFiManager.cpp                                   |  6 +++---
 WiFiManager.h                                     | 15 +++++++++++----
 .../OnDemandConfigPortal/OnDemandConfigPortal.ino |  1 +
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index ab28eb1..f1dc6e8 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -213,10 +213,10 @@ void WiFiManager::setupConfigPortal() {
 
   // setup dns and web servers
   dnsServer.reset(new DNSServer());
-  #ifdef ESP8266
-    server.reset(new ESP8266WebServer(80));
-  #elif defined(ESP32)
+  #ifdef WEBSERVERSHIM
     server.reset(new WebServer(80));
+  #else
+    server.reset(new ESP8266WebServer(80));
   #endif
 
   /* Setup the DNS server redirecting all the domains to the apIP */
diff --git a/WiFiManager.h b/WiFiManager.h
index b2411ba..484742a 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -22,18 +22,25 @@
     }
     #include <ESP8266WiFi.h>
     #include <ESP8266WebServer.h>
-    
+
     #define WIFI_getChipId() ESP.getChipId()
     #define WIFI_AUTH_OPEN   ENC_TYPE_NONE
 
 #elif defined(ESP32)
-    
+
     #include <WiFi.h>
-    #include <WebServer.h>
     #include <esp_wifi.h>  
     
     #define WIFI_getChipId() (uint32_t)ESP.getEfuseMac()
     #define WIFI_AUTH_OPEN   WIFI_AUTH_OPEN
+    
+    #ifdef WEBSERVERSHIM
+        #include <WebServer.h>
+    #else
+        #include <ESP8266WebServer.h>
+        // Forthcoming official
+        // https://github.com/esp8266/ESPWebServer
+    #endif
 
 #else
 #endif
@@ -178,7 +185,7 @@ class WiFiManager
   private:
     std::unique_ptr<DNSServer>        dnsServer;
 
-    #if defined(ESP32) && defined(WEBSERVERSHIM)
+    #ifdef WEBSERVERSHIM
         std::unique_ptr<WebServer> server;
     #else
         std::unique_ptr<ESP8266WebServer> server;
diff --git a/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino b/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino
index 4f8f74a..fbfd6f2 100644
--- a/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino
+++ b/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino
@@ -5,6 +5,7 @@
 #else
 #include <WiFi.h>
 #include <WebServer.h>
+// #include <ESP8266WebServer.h>
 #endif
 
 #include <DNSServer.h>