diff mbox

kvm tools: fix SDL build error when libsdl isn't installed

Message ID 1347878019-32683-1-git-send-email-levinsasha928@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Sasha Levin Sept. 17, 2012, 10:33 a.m. UTC
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@gmail.com>
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
---
 tools/kvm/include/kvm/sdl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Kashyap Chamarthy Sept. 17, 2012, 11:23 a.m. UTC | #1
On Mon, Sep 17, 2012 at 4:03 PM, Sasha Levin <levinsasha928@gmail.com> wrote:
> 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@gmail.com>
> Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
> ---
>  tools/kvm/include/kvm/sdl.h | 4 ++--
>  1 file 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)");
>  }
> --
> 1.7.12
>

Just for info for to the list, this does not apply.

I'm testing the newer patch sent by Sasha.

Thanks.
/kashyap
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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)");
 }