png-1.5 defines PNG_CALLBACK as well, so rename our PNG_CALLBACK