From 18135b4dd6fcadae1bae357b9ae419c89bea13e6 Mon Sep 17 00:00:00 2001
From: Simon <sleepdefic1t@users.noreply.github.com>
Date: Sat, 26 Jan 2019 09:26:34 -0800
Subject: [PATCH] fix: rename helpers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cpp-Client uses the header 'helpers/helpers.h'.
Cpp-Crypto also uses this 'helpers/helpers.h' naming.
These headers are not identical and contain only “helper” functions specific to its library.
When both Cpp-Client & Cpp-Crypto are included in the same project, it results in a name collision causing one of the headers to be dropped.
This PR renames 'helpers/helpers.h' to 'helpers/client_helpers.h’, and resolves the name collision.
---
src/helpers/{helpers.h => client_helpers.h} | 4 ++--
src/http/iot/http.cpp | 2 +-
src/http/iot/main.cpp | 2 +-
src/http/os/http.cpp | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
rename src/helpers/{helpers.h => client_helpers.h} (93%)
diff --git a/src/helpers/helpers.h b/src/helpers/client_helpers.h
similarity index 93%
rename from src/helpers/helpers.h
rename to src/helpers/client_helpers.h
index 785f0415..d3e8fc5f 100644
--- a/src/helpers/helpers.h
+++ b/src/helpers/client_helpers.h
@@ -7,8 +7,8 @@
* file that was distributed with this source code.
**/
-#ifndef HELPERS_H
-#define HELPERS_H
+#ifndef CLIENT_HELPERS_H
+#define CLIENT_HELPERS_H
#include <cstring>
#include <string>
diff --git a/src/http/iot/http.cpp b/src/http/iot/http.cpp
index 40506c33..1d6f526d 100644
--- a/src/http/iot/http.cpp
+++ b/src/http/iot/http.cpp
@@ -1,7 +1,7 @@
#include "http/http.h"
#include <memory>
#include <vector>
-#include "helpers/helpers.h"
+#include "helpers/client_helpers.h"
#ifdef ESP8266
#include <ESP8266HTTPClient.h>
diff --git a/src/http/iot/main.cpp b/src/http/iot/main.cpp
index d11e8c99..dcae0526 100644
--- a/src/http/iot/main.cpp
+++ b/src/http/iot/main.cpp
@@ -1,4 +1,4 @@
-#include "helpers/helpers.h"
+#include "helpers/client_helpers.h"
#if (defined PLATFORMIO && !defined UNIT_TEST)
diff --git a/src/http/os/http.cpp b/src/http/os/http.cpp
index a65dd92b..28732704 100644
--- a/src/http/os/http.cpp
+++ b/src/http/os/http.cpp
@@ -1,5 +1,5 @@
#include "http/http.h"
-#include "helpers/helpers.h"
+#include "helpers/client_helpers.h"
#ifndef USE_IOT