pxcloud/spice-common
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-common synced 2026-08-17 21:00:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rect: Avoid usage of "small"

Browse Source 
Some Windows headers define "small" causing issues.
Use "small_rect" instead. For coherence use "big_rect" instead of
"big".

Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
Acked-by: Francesco Giudici <fgiudici@redhat.com>
This commit is contained in:
Frediano Ziglio 2020-06-18 20:08:13 +01:00
parent 5d8feeb19a
commit ba7af04f65
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/rect.h
View File

@ -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_rect, const SpiceRect *small_rect)
{
return big->left <= small->left && big->right >= small->right &&
big->top <= small->top && big->bottom >= small->bottom;
return big_rect->left <= small_rect->left && big_rect->right >= small_rect->right &&
big_rect->top <= small_rect->top && big_rect->bottom >= small_rect->bottom;
}
static inline int rect_get_area(const SpiceRect *r)
@ -130,9 +130,9 @@ static inline int rect_is_same_size(const SpiceRect& r1, const SpiceRect& r2)
return rect_is_same_size(&r1, &r2);
}
static inline int rect_contains(const SpiceRect& big, const SpiceRect& small)
static inline int rect_contains(const SpiceRect& big_rect, const SpiceRect& small_rect)
{
return rect_contains(&big, &small);
return rect_contains(&big_rect, &small_rect);
}
static inline int rect_get_area(const SpiceRect& r)