patched the offending function so that -Wno-return-type should not be necessary.