Fix dll linking warnings for VS 2015/17 (#467)

-- #ifdef out duplicate definitions
-- remove make_nan() dead code
2 files changed