EDIT: I posted a message yesterday about ESP_ARDUINO_VERSION_MAJOR not being defined any more in 2.0.4
The massage was wrong, somehow I managed to screw things up...
There is no problem with these version related macros.
Sorry for spreading false news