gistfile1.txt

diff --git a/configure.ac b/configure.ac
index 5e9e71a..943da75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO)
 
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
-AM_PATH_CPPUNIT(1.9.6)
+#AM_PATH_CPPUNIT(1.9.6)
 
 AC_PROG_CXX
 
diff --git a/src/torrent/utils/net.cc b/src/torrent/utils/net.cc
index 607bfbe..ed24fab 100644
--- a/src/torrent/utils/net.cc
+++ b/src/torrent/utils/net.cc
@@ -38,13 +38,14 @@
 
 #include "net.h"
 #include "exceptions.h"
+#include <string.h>
 
 namespace torrent {
 
 addrinfo*
 address_info_lookup(const char* hostname, int family, int socktype) {
   addrinfo hints;
-  std::memset(&hints, 0, sizeof(addrinfo));
+  memset(&hints, 0, sizeof(addrinfo));
   hints.ai_family = family;
   hints.ai_socktype = socktype;