Really fix build on 5.3.3. Fixes PHP-948

These version macros really need to be unified