conditional compilation for the Hook example

d-a-v · Aug 10, 2020 · b2264b5 · b2264b5
1 parent 99d332d
commit b2264b5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/ESPWebDAV.cpp b/ESPWebDAV.cpp
@@ -1118,7 +1118,7 @@ bool ESPWebDAVCore::copyFile(File srcFile, const String& destName)
         ///XXX USE STREAMTO
         yield();
         char cp[128];
-        auto nb = srcFile.read((uint8_t*)cp, sizeof(cp));
+        int nb = srcFile.read((uint8_t*)cp, sizeof(cp));
         if (!nb)
         {
             DBG_PRINTF("copy: short read\n");

diff --git a/WebDav4WebServer.cpp b/WebDav4WebServer.cpp
@@ -1,6 +1,8 @@
 
 #include <WebDav4WebServer.h>
 
+#if WEBSERVER_HAS_HOOK
+
 ESP8266WebServer::HookFunction hookWebDAVForWebserver(const String& davRootDir, ESPWebDAVCore& dav)
 {
     return [&dav, davRootDir](const String & method, const String & url, WiFiClient * client, ESP8266WebServer::ContentTypeFunction contentType)
@@ -11,3 +13,5 @@ ESP8266WebServer::HookFunction hookWebDAVForWebserver(const String& davRootDir,
             ESP8266WebServer::CLIENT_MUST_STOP;
     };
 }
+
+#endif // WEBSERVER_HAS_HOOK
diff --git a/WebDav4WebServer.h b/WebDav4WebServer.h
@@ -5,7 +5,11 @@
 #include <ESPWebDAV.h>
 #include <ESP8266WebServer.h>
 
+#if WEBSERVER_HAS_HOOK
+
 extern "C"
 ESP8266WebServer::HookFunction hookWebDAVForWebserver(const String& davRootDir, ESPWebDAVCore& dav);
 
+#endif // WEBSERVER_HAS_HOOK
+
 #endif // __WEBDAV4WEBSERVER
diff --git a/examples/Hooked/Hooked.ino b/examples/Hooked/Hooked.ino
@@ -55,6 +55,10 @@
 #include <LittleFS.h>
 #include <WebDav4WebServer.h>
 
+#if !WEBSERVER_HAS_HOOK
+#error This sketch needs ESP8266WebServer::HookFunction and ESP8266WebServer::addHook
+#endif
+
 #define HOSTNAME    "ESPWebDAV"
 
 #ifndef STASSID