Merge branch 'ethernet-dns-fix' of https://github.com/cmaglie/Arduino

1 files changed, 3 insertions, 1 deletions

diff --git a/cores/arduino/IPAddress.h b/cores/arduino/IPAddress.h
index 94acdc4..b20ab58 100644
--- a/cores/arduino/IPAddress.h
+++ b/cores/arduino/IPAddress.h
@@ -45,6 +45,9 @@ public:
     IPAddress(uint32_t address);
     IPAddress(const uint8_t *address);
 
+    bool fromString(const char *address);
+    bool fromString(const String &address) { return fromString(address.c_str()); }
+
     // Overloaded cast operator to allow IPAddress objects to be used where a pointer
     // to a four-byte uint8_t array is expected
     operator uint32_t() const { return _address.dword; };
@@ -71,5 +74,4 @@ public:
 
 const IPAddress INADDR_NONE(0,0,0,0);
 
-
 #endif