[master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea

src/bin/dhcp4/tests/Makefile.am

@@ -75,7 +75,6 @@ libco2_la_LDFLAGS = -avoid-version -export-dynamic -module -rpath /nowhere
 TESTS += dhcp4_unittests
 
 dhcp4_unittests_SOURCES  = d2_unittest.h d2_unittest.cc
-dhcp4_unittests_SOURCES += dhcp4_test_utils.h
 dhcp4_unittests_SOURCES += dhcp4_unittests.cc
 dhcp4_unittests_SOURCES += dhcp4_srv_unittest.cc
 dhcp4_unittests_SOURCES += dhcp4_test_utils.cc dhcp4_test_utils.h

src/lib/dns/rrttl.cc

@@ -1,4 +1,4 @@
-// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010, 2015  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -35,7 +35,7 @@ namespace {
 // Then the find_if doesn't work.
 bool
 myIsalpha(char c) {
-    return (isalpha(c));
+    return (isalpha(c) != 0);
 }
 
 // The conversion of units to their size

src/lib/util/unittests/check_valgrind.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -30,8 +30,6 @@
 #ifndef UTIL_UNITTESTS_CHECK_VALGRIND_H
 #define UTIL_UNITTESTS_CHECK_VALGRIND_H 1
 
-#include <config.h>
-
 namespace isc {
 namespace util {
 namespace unittests {