This fixes some problems with gcc-5. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47539