From: Remi Gacogne Date: Wed, 15 Mar 2017 14:42:02 +0000 (+0100) Subject: Fix dns_random unit tests with gcc > 4 X-Git-Tag: rec-4.0.5-rc1~4^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5148%2Fhead;p=thirdparty%2Fpdns.git Fix dns_random unit tests with gcc > 4 (cherry picked from commit 4b587bc5a1a25a285c614ae772f0896d65954ad9) --- diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am index 77b43c5e2b..567aab096f 100644 --- a/pdns/recursordist/Makefile.am +++ b/pdns/recursordist/Makefile.am @@ -175,6 +175,7 @@ testrunner_SOURCES = \ dnslabeltext.cc \ dnsname.cc dnsname.hh \ dnsparser.hh dnsparser.cc \ + dns_random.cc dns_random.hh \ dnsrecords.cc \ dnssecinfra.cc \ dnswriter.cc dnswriter.hh \ diff --git a/pdns/test-dns_random_hh.cc b/pdns/test-dns_random_hh.cc index dfa77ef20f..1dda1ade7d 100644 --- a/pdns/test-dns_random_hh.cc +++ b/pdns/test-dns_random_hh.cc @@ -2,7 +2,7 @@ #define BOOST_TEST_NO_MAIN // Disable this code for gcc 4.8 and lower -#if (__GNUC__ == 4 && __GNUC_MINOR__ > 8) || !__GNUC__ +#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ > 8) || !__GNUC__ #ifdef HAVE_CONFIG_H #include "config.h"