Commit-ID: 2840c0281d698ca17d4afb9b612da2582fcacc86 Gitweb: http://git.kernel.org/tip/2840c0281d698ca17d4afb9b612da2582fcacc86 Author: Sasha Levin <levinsasha928@xxxxxxxxx> AuthorDate: Mon, 17 Sep 2012 12:33:39 +0200 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Tue, 18 Sep 2012 10:56:31 +0300 kvm tools: fix SDL build error when libsdl isn't installed We used wrong prototypes for sdl init/exit when libsdl wasn't installed when building. This would cause build errors. Reported-by: Kashyap Chamarthy <kashyap.cv@xxxxxxxxx> Signed-off-by: Sasha Levin <levinsasha928@xxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/include/kvm/sdl.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/kvm/include/kvm/sdl.h b/tools/kvm/include/kvm/sdl.h index b444333..19e1d74 100644 --- a/tools/kvm/include/kvm/sdl.h +++ b/tools/kvm/include/kvm/sdl.h @@ -9,11 +9,11 @@ struct framebuffer; int sdl__init(struct kvm *kvm); int sdl__exit(struct kvm *kvm); #else -static inline void sdl__init(struct kvm *kvm) +static inline int sdl__init(struct kvm *kvm) { die("SDL support not compiled in. (install the SDL-dev[el] package)"); } -static inline void sdl__exit(struct kvm *kvm) +static inline int sdl__exit(struct kvm *kvm) { die("SDL support not compiled in. (install the SDL-dev[el] package)"); } -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html