diff --git a/Makefile b/Makefile
index 5b97fdd..e8a23a9 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ ARTOOL=ar
 ARFLAGS=rcs
 CC=gcc
 CXX=g++
-CXXFLAGS+=-Wno-unknown-pragmas -Wno-pointer-arith -Wno-deprecated-declarations -Wno-conversion-null
+CXXFLAGS+=-fpermissive -Wno-unknown-pragmas -Wno-pointer-arith -Wno-deprecated-declarations -Wno-conversion-null
 WINDEFS=-lws2_32 -lshlwapi -liphlpapi -static -static-libgcc -static-libstdc++
 LWIPARCHINCLUDE=$(LWIPCONTRIBDIR)/ports/win32/include
 endif
diff --git a/src/libzt.cpp b/src/libzt.cpp
index 2775851..c9e9a7d 100644
--- a/src/libzt.cpp
+++ b/src/libzt.cpp
@@ -270,14 +270,14 @@ int zts_sethostname(const char *name, size_t len)
 struct hostent *zts_gethostbyname(const char *name)
 {
 #if defined(STACK_LWIP)
-	// TODO:
+	// TODO: Test thread safety
+	/*
 	char buf[256];
 	int buflen = 256;
 	int h_err = 0;
 	struct hostent hret;
 	struct hostent **result = NULL;
 	int err = 0;
-	/*
 	if ((err = lwip_gethostbyname_r(name, &hret, buf, buflen, result, &h_err)) != 0) {
 		DEBUG_ERROR("err = %d", err);
 		DEBUG_ERROR("h_err = %d", h_err);
@@ -287,8 +287,6 @@ struct hostent *zts_gethostbyname(const char *name)
 	return *result;
 	*/
 	return lwip_gethostbyname(name);
-
-
 #endif
 #if defined(STCK_PICO)
 #endif