Make it compile as C++ code AGAIN