up to 3.3.1
fix for MAX macro being undefined
out of tree build is still broken