Merge branch 'jc/fmt-patch' into next

diff --git a/Makefile b/Makefile
index d171829e02cbc22cd4d9299b10f282d71a248a5f..5bf820c82b53ca467b2c057abbddb440c531b002 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -421,6 +421,9 @@ else
        ALL_CFLAGS += -Dsockaddr_storage=sockaddr_in6
 endif
 endif
+ifdef NO_INET_NTOP
+       LIB_OBJS += compat/inet_ntop.o
+endif
 
 ifdef NO_ICONV
        ALL_CFLAGS += -DNO_ICONV