Add hack to work around an undef of min() and max() in...

Add hack to work around an undef of min() and max() in x86_64-pc-linux-gnu/bits/c++config.h for GCC 6 and above, only a problem when we build with g++