[Spice-devel] [spice-common PATCH] rect.h: rename variable "small" to "sml"

[Hans de Goede]

Hi,

Hmm I don't really like the name sml, but I cannot come
up with anything better, so: ACK.

Regards,

Hans


On 05/07/2012 09:41 AM, Uri Lublin wrote:
> Apparently when compiling spice-gtk with mingw, small is defined as char.
>
> I found the following in rpcndr.h under mingw/include (not sure what includes it)
>      #define small char
>
> This fixes the following compilation errer:
>     In file included from ../spice-common/common/canvas_base.c:36:0,
>                      from ../spice-common/common/sw_canvas.c:29:
>     ../spice-common/common/rect.h:78:72: error: expected ';', ',' or ')' before 'char'
> ---
>   common/rect.h |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/common/rect.h b/common/rect.h
> index f8bacf1..5698fce 100644
> --- a/common/rect.h
> +++ b/common/rect.h
> @@ -75,10 +75,10 @@ static INLINE int rect_is_same_size(const SpiceRect *r1, const SpiceRect *r2)
>              r1->bottom - r1->top == r2->bottom - r2->top;
>   }
>
> -static INLINE int rect_contains(const SpiceRect *big, const SpiceRect *small)
> +static INLINE int rect_contains(const SpiceRect *big, const SpiceRect *sml)
>   {
> -    return big->left<= small->left&&  big->right>= small->right&&
> -           big->top<= small->top&&  big->bottom>= small->bottom;
> +    return big->left<= sml->left&&  big->right>= sml->right&&
> +           big->top<= sml->top&&  big->bottom>= sml->bottom;
>   }
>
>   static INLINE int rect_get_area(const SpiceRect *r)