diff options
author | Federico Fissore <f.fissore@arduino.cc> | 2013-01-28 11:37:51 +0100 |
---|---|---|
committer | Federico Fissore <f.fissore@arduino.cc> | 2013-01-28 11:37:51 +0100 |
commit | 5c67c7e5c674a572dd99e9d0d8c19c718c9985bc (patch) | |
tree | 1f22ba2385ad22eca306d67793c0827451f2b50a /libraries/Ethernet/Ethernet.cpp | |
parent | c453e0a32e7adf5e7bab7bfb7c8f7a21e30ca563 (diff) | |
parent | c6287dd6ac33544179a6544b8f3f55a396ec6608 (diff) |
Merge branch 'ide-1.5.x' into lib-1.5
Diffstat (limited to 'libraries/Ethernet/Ethernet.cpp')
-rw-r--r-- | libraries/Ethernet/Ethernet.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libraries/Ethernet/Ethernet.cpp b/libraries/Ethernet/Ethernet.cpp index 5d28f71..c31a85f 100644 --- a/libraries/Ethernet/Ethernet.cpp +++ b/libraries/Ethernet/Ethernet.cpp @@ -10,7 +10,8 @@ uint16_t EthernetClass::_server_port[MAX_SOCK_NUM] = { int EthernetClass::begin(uint8_t *mac_address) { - _dhcp = new DhcpClass(); + static DhcpClass s_dhcp; + _dhcp = &s_dhcp; // Initialise the basic info |