[Spice-devel] [PATCH 04/24] build: use jpeg_boolean with more recent libjpeg versions.

[Hans de Goede]

Ack.

On 12/07/2010 10:28 PM, Alon Levy wrote:
> From: Gerd Hoffmann<kraxel at redhat.com>
>
> Signed-off-by: Gerd Hoffmann<kraxel at redhat.com>
> ---
>   client/jpeg_decoder.cpp  |    6 +++++-
>   client/mjpeg_decoder.cpp |    6 +++++-
>   2 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/client/jpeg_decoder.cpp b/client/jpeg_decoder.cpp
> index a7824a9..f5a0198 100644
> --- a/client/jpeg_decoder.cpp
> +++ b/client/jpeg_decoder.cpp
> @@ -20,6 +20,10 @@
>   #include "debug.h"
>   #include "utils.h"
>
> +#if JPEG_LIB_VERSION<  70
> +#define jpeg_boolean boolean
> +#endif
> +
>   static void op_begin_decode(SpiceJpegDecoder *decoder,
>                               uint8_t* data,
>                               int data_size,
> @@ -45,7 +49,7 @@ extern "C" {
>       {
>       }
>
> -    static boolean jpeg_decoder_fill_input_buffer(j_decompress_ptr cinfo)
> +    static jpeg_boolean jpeg_decoder_fill_input_buffer(j_decompress_ptr cinfo)
>       {
>           PANIC("no more data for jpeg");
>           return FALSE;
> diff --git a/client/mjpeg_decoder.cpp b/client/mjpeg_decoder.cpp
> index 2470fb1..f9cb603 100644
> --- a/client/mjpeg_decoder.cpp
> +++ b/client/mjpeg_decoder.cpp
> @@ -21,6 +21,10 @@
>   #include "utils.h"
>   #include "mjpeg_decoder.h"
>
> +#if JPEG_LIB_VERSION<  70
> +#define jpeg_boolean boolean
> +#endif
> +
>   enum {
>       STATE_READ_HEADER,
>       STATE_START_DECOMPRESS,
> @@ -34,7 +38,7 @@ extern "C" {
>       {
>       }
>
> -    static boolean fill_input_buffer(j_decompress_ptr cinfo)
> +    static jpeg_boolean fill_input_buffer(j_decompress_ptr cinfo)
>       {
>           return FALSE;
>       }