diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-04 12:08:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-04 12:08:23 +0100 |
| commit | 31fd4c5654595a4763e492e4ec26f66ca3a8a405 (patch) | |
| tree | 8d6b249c93725e838676e26af171a167f6f20903 /pixman/pixman | |
| parent | e4ef724e06621be9325fc41ed886fd404467fdc0 (diff) | |
| download | vcxsrv-31fd4c5654595a4763e492e4ec26f66ca3a8a405.tar.gz vcxsrv-31fd4c5654595a4763e492e4ec26f66ca3a8a405.tar.bz2 vcxsrv-31fd4c5654595a4763e492e4ec26f66ca3a8a405.zip | |
libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov 2013
xserver commit 33c85beed521c9db140cadd8c5aa9992398ee1fe
xkbcomp commit e3e6e938535532bfad175c1635256ab7fb3ac943
pixman commit 8cbc7da4e525c96a8e089e4c1baee75dc8315218
libxtrans commit 1fb0fd555a16dd8fce4abc6d3fd22b315f46762a
fontconfig commit 767108aa1327cf0156dfc6f024dbc8fb783ae067
mesa commit 2f896627175384fd5943f21804700a155ba4e8a0
Diffstat (limited to 'pixman/pixman')
| -rw-r--r-- | pixman/pixman/pixman-matrix.c | 2 | ||||
| -rw-r--r-- | pixman/pixman/pixman.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pixman/pixman/pixman-matrix.c b/pixman/pixman/pixman-matrix.c index 89b96826b..4032c137a 100644 --- a/pixman/pixman/pixman-matrix.c +++ b/pixman/pixman/pixman-matrix.c @@ -37,7 +37,7 @@ static force_inline int count_leading_zeros (uint32_t x) { -#ifdef __GNUC__ +#ifdef HAVE_BUILTIN_CLZ return __builtin_clz (x); #else int n = 0; diff --git a/pixman/pixman/pixman.h b/pixman/pixman/pixman.h index 7ff9fb52a..509ba5e53 100644 --- a/pixman/pixman/pixman.h +++ b/pixman/pixman/pixman.h @@ -1030,7 +1030,7 @@ struct pixman_triangle #define pixman_trapezoid_valid(t) \ ((t)->left.p1.y != (t)->left.p2.y && \ (t)->right.p1.y != (t)->right.p2.y && \ - (int) ((t)->bottom - (t)->top) > 0) + ((t)->bottom > (t)->top)) struct pixman_span_fix { |