Revert "Fix incorrect definition of major(3)/minor(3) macros." This patch is part of a series which broke the build on MSVC.
This reverts commit 3c1e1648a94c474c9270e203e9462285cd5d0619.