Index: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4	(revision 474)
+++ trunk/aclocal.m4	(revision 475)
@@ -1228,5 +1228,4 @@
   if test "X$CC" != "X"; then
      AC_MSG_CHECKING([whether ${CC} accepts $1])
-dnl      flag_check_cv,
      saved_cflags="$CFLAGS"
      CFLAGS="$CFLAGS -Werror $1"
@@ -1240,20 +1239,4 @@
         AC_MSG_RESULT([no])
      fi
-  fi
-])
-
-AC_DEFUN([GCC_WEMPTY_BODY],[
-  AC_LANG_ASSERT(C)
-  if test "X$CC" != "X"; then
-    AC_CHECK([whether ${CC} accepts -Wno-empty-body],
-dnl      empty_cv_body,
-      [empty_body_cflags="$CFLAGS"
-       CFLAGS="$CFLAGS -Werror -Wno-empty-body"
-       AC_TRY_COMPILE(,, empty_cv_body=yes, empty_cv_body=no)
-       CFLAGS="$empty_body_cflags"
-      ])
-    if test $empty_cv_body = yes; then
-      CFLAGS="$CFLAGS -Wno-empty-body"
-    fi
   fi
 ])
Index: trunk/docs/Changelog
===================================================================
--- trunk/docs/Changelog	(revision 474)
+++ trunk/docs/Changelog	(revision 475)
@@ -1,3 +1,3 @@
-
+3.1.6:
 	* Modify testcompile.sh to remove 'smatch' and use 'clang'
 	  instead.
@@ -10,5 +10,5 @@
 	* Add more debug code in connect_port()
 
-3.1.5:
+3.1.5 (26-03-2015):
 	* Fix IPv6 issue with portcheck (need to be able to specify
 	  IPv6 interfaces).