Fix void* pointer arithmetic in cintcmp(). Fix invalid ';'s in declarations after possibly-empty macros.