From 59a9f857866965f9b73fde7f0a5edd0b40a318eb Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrokhotkov@gmail.com>
Date: Wed, 5 Aug 2015 08:36:43 -0400
Subject: [PATCH] Resolve naming conflicts between FS and SD library

---
 hardware/esp8266com/esp8266/cores/esp8266/FS.cpp          | 2 ++
 hardware/esp8266com/esp8266/cores/esp8266/FS.h            | 8 ++++++++
 hardware/esp8266com/esp8266/cores/esp8266/FSImpl.h        | 3 +++
 hardware/esp8266com/esp8266/cores/esp8266/spiffs_api.cpp  | 2 ++
 .../libraries/ESP8266WebServer/src/ESP8266WebServer.cpp   | 3 ++-
 .../libraries/ESP8266WebServer/src/ESP8266WebServer.h     | 4 ++--
 6 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/hardware/esp8266com/esp8266/cores/esp8266/FS.cpp b/hardware/esp8266com/esp8266/cores/esp8266/FS.cpp
index 030d79f0d6..7a13dcede8 100644
--- a/hardware/esp8266com/esp8266/cores/esp8266/FS.cpp
+++ b/hardware/esp8266com/esp8266/cores/esp8266/FS.cpp
@@ -21,6 +21,8 @@
 #include "FS.h"
 #include "FSImpl.h"
 
+using namespace fs;
+
 static bool sflags(const char* mode, OpenMode& om, AccessMode& am);
 
 size_t File::write(uint8_t c) {
diff --git a/hardware/esp8266com/esp8266/cores/esp8266/FS.h b/hardware/esp8266com/esp8266/cores/esp8266/FS.h
index c2b29ba096..3e1b1b4fc1 100644
--- a/hardware/esp8266com/esp8266/cores/esp8266/FS.h
+++ b/hardware/esp8266com/esp8266/cores/esp8266/FS.h
@@ -24,6 +24,8 @@
 #include <Arduino.h>
 #include <memory>
 
+namespace fs {
+
 class File;
 class Dir;
 
@@ -106,6 +108,12 @@ class FS
 
 };
 
+} // namespace fs
+
+using fs::FS;
+using fs::File;
+using fs::Dir;
+
 extern FS SPIFFS;
 
 #endif //FS_H
diff --git a/hardware/esp8266com/esp8266/cores/esp8266/FSImpl.h b/hardware/esp8266com/esp8266/cores/esp8266/FSImpl.h
index f11342f12b..8e48a9fda0 100644
--- a/hardware/esp8266com/esp8266/cores/esp8266/FSImpl.h
+++ b/hardware/esp8266com/esp8266/cores/esp8266/FSImpl.h
@@ -23,6 +23,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+namespace fs {
+
 class FileImpl {
 public:
     virtual ~FileImpl() { }
@@ -67,5 +69,6 @@ class FSImpl {
 
 };
 
+} // namespace fs
 
 #endif //FSIMPL_H
diff --git a/hardware/esp8266com/esp8266/cores/esp8266/spiffs_api.cpp b/hardware/esp8266com/esp8266/cores/esp8266/spiffs_api.cpp
index 4807550879..157ae86bcd 100644
--- a/hardware/esp8266com/esp8266/cores/esp8266/spiffs_api.cpp
+++ b/hardware/esp8266com/esp8266/cores/esp8266/spiffs_api.cpp
@@ -32,6 +32,8 @@ extern "C" {
 #include "spi_flash.h"
 }
 
+using namespace fs;
+
 extern int32_t spiffs_hal_write(uint32_t addr, uint32_t size, uint8_t *src);
 extern int32_t spiffs_hal_erase(uint32_t addr, uint32_t size);
 extern int32_t spiffs_hal_read(uint32_t addr, uint32_t size, uint8_t *dst);
diff --git a/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
index bc00737749..c709dcfdd2 100644
--- a/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
+++ b/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
@@ -24,6 +24,7 @@
 #include <Arduino.h>
 #include "WiFiServer.h"
 #include "WiFiClient.h"
+#include "FS.h"
 #include "ESP8266WebServer.h"
 #include "detail/RequestHandler.h"
 // #define DEBUG
@@ -77,7 +78,7 @@ void ESP8266WebServer::_addRequestHandler(RequestHandler* handler) {
     }
 }
 
-void ESP8266WebServer::serveStatic(const char* uri, FS fs, const char* path) {
+void ESP8266WebServer::serveStatic(const char* uri, FS& fs, const char* path) {
     _addRequestHandler(new StaticRequestHandler(fs, uri));
 }
 
diff --git a/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.h b/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.h
index 49c610294e..74d3ecb45d 100644
--- a/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.h
+++ b/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.h
@@ -25,7 +25,6 @@
 #define ESP8266WEBSERVER_H
 
 #include <functional>
-#include <FS.h>
 
 enum HTTPMethod { HTTP_ANY, HTTP_GET, HTTP_POST, HTTP_PUT, HTTP_PATCH, HTTP_DELETE };
 enum HTTPUploadStatus { UPLOAD_FILE_START, UPLOAD_FILE_WRITE, UPLOAD_FILE_END };
@@ -39,6 +38,7 @@ enum HTTPUploadStatus { UPLOAD_FILE_START, UPLOAD_FILE_WRITE, UPLOAD_FILE_END };
 #define CONTENT_LENGTH_NOT_SET ((size_t) -2)
 
 class RequestHandler;
+class FS;
 
 typedef struct {
   HTTPUploadStatus status;
@@ -62,7 +62,7 @@ class ESP8266WebServer
   typedef std::function<void(void)> THandlerFunction;
   void on(const char* uri, THandlerFunction handler);
   void on(const char* uri, HTTPMethod method, THandlerFunction fn);
-  void serveStatic(const char* uri, FS fs, const char* path);
+  void serveStatic(const char* uri, FS& fs, const char* path);
   void onNotFound(THandlerFunction fn);  //called when handler is not assigned
   void onFileUpload(THandlerFunction fn); //handle file uploads