Patch from openSUSE to add some needed returns and stuff
Suspend -Wall warnings from GNU C++