Use the ISC_MAX define instead of "x = a > b ? a : b" paradigm.
Remove an unneeded include.
(cherry picked from commit 5d6f0de84b)
Use the ISC_MAX define instead of "x = a > b ? a : b" paradigm.
Remove an unneeded include.
(cherry picked from commit 5d6f0de84b)