]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #6595 from Habbie/rec-4.1.x-boost-L
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Fri, 18 May 2018 12:08:49 +0000 (13:08 +0100)
committerGitHub <noreply@github.com>
Fri, 18 May 2018 12:08:49 +0000 (13:08 +0100)
reorder includes to avoid Boost L conflict

1  2 
pdns/lua-recursor4.cc
pdns/pdns_recursor.cc
pdns/rec-lua-conf.cc
pdns/rec_channel_rec.cc
pdns/rpzloader.cc
pdns/syncres.cc
pdns/syncres.hh
pdns/ws-recursor.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
Simple merge