Do not force Z_CONST for C++. Forcing Z_CONST resulted in an issue when compiling Firefox. Now if someone wants to compile zlib as C++ code (which it isn't), now they will need to #define Z_CONST themselves.