diff options
author | Zach Eveland <zeveland@blacklabel-development.com> | 2011-09-08 20:26:47 -0400 |
---|---|---|
committer | Zach Eveland <zeveland@blacklabel-development.com> | 2011-09-08 20:26:47 -0400 |
commit | c0ad36ad4341b90a0bd3acde1e50ce85dfd2f4a8 (patch) | |
tree | ce305833da2f7cac516d33bcb6bd7cebeb2d0adb /cores/arduino/Client.h | |
parent | e52cf0e4203bd6dda76c2544b0479548f465a0c7 (diff) | |
parent | 8b13206e655cd9c1123d842cab1fdd0afd6edc8b (diff) |
Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension
Conflicts:
build/linux/dist/tools/avrdude.conf
Diffstat (limited to 'cores/arduino/Client.h')
-rw-r--r-- | cores/arduino/Client.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cores/arduino/Client.h b/cores/arduino/Client.h index ed9e9b4..ea13483 100644 --- a/cores/arduino/Client.h +++ b/cores/arduino/Client.h @@ -10,7 +10,6 @@ public: virtual int connect(IPAddress ip, uint16_t port) =0; virtual int connect(const char *host, uint16_t port) =0; virtual size_t write(uint8_t) =0; - virtual size_t write(const char *str) =0; virtual size_t write(const uint8_t *buf, size_t size) =0; virtual int available() = 0; virtual int read() = 0; |