Fix compilation on systems with older compilers.

This patch fixes a build error with GCC 7.x which doesn't seem to accept const int's as constants in macro initialization.

See: #40410 (closed)

This MR replaces !398 (closed)