minor fixes that came up when building with gcc -ansi -pedantic
minor fixes that came up when building with gcc -ansi -pedantic

matzipan/evolution-data-server,Distrotech/evolution-data-server,matzipan/evolution-data-server,tintou/evolution-data-server,Distrotech/evolution-data-server,Distrotech/evolution-data-server,matzipan/evolution-data-server,gcampax/evolution-data-server,tintou/evolution-data-server,gcampax/evolution-data-server,Distrotech/evolution-data-server,gcampax/evolution-data-server,Distrotech/evolution-data-server,matzipan/evolution-data-server,tintou/evolution-data-server,matzipan/evolution-data-server,gcampax/evolution-data-server,tintou/evolution-data-server