* cxx-pretty-print.c: Correct merge error.