fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-08 07:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't mix declarations and code. This makes the code valid ISO C, fixes a gcc -pedantic warning, and unbreaks the build with the compiler Zeta ships with.

Browse source
This commit is contained in:
Christian Biesinger 2006-01-21 09:39:10 +00:00
parent f1fd1cc7a9
commit 2afe78c0c2
4 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2006-01-21 Christian Biesinger <cbiesinger@web.de>
* pixman/src/fbpict.c: (detectCPUFeatures):
* src/cairo-paginated-surface.c:
(_cairo_paginated_surface_get_target):
* test/cairo-test.c: (create_image_surface):
Don't mix declarations and code. This makes the code valid ISO C,
fixes a gcc -pedantic warning, and unbreaks the build with the
compiler Zeta ships with.
2006-01-20 Carl Worth <cworth@cworth.org>
* src/cairo.h:

6
pixman/src/fbpict.c
View file

@ -1,5 +1,5 @@
/*
* $Id: fbpict.c,v 1.7 2005-09-19 02:34:36 vektor Exp $
* $Id: fbpict.c,v 1.8 2006-01-21 17:39:11 biesi Exp $
*
* Copyright © 2000 SuSE, Inc.
*
@ -1927,7 +1927,7 @@ enum CPUFeatures {
};
static unsigned int detectCPUFeatures(void) {
unsigned int result;
unsigned int result, features;
char vendor[13];
vendor[0] = 0;
vendor[12] = 0;
@ -1973,7 +1973,7 @@ static unsigned int detectCPUFeatures(void) {
: "%eax", "%ecx", "%edx"
);
unsigned int features = 0;
features = 0;
if (result) {
/* result now contains the standard feature bits */
if (result & (1 << 15))

5
src/cairo-paginated-surface.c
View file

@ -139,10 +139,11 @@ _cairo_surface_is_paginated (cairo_surface_t *surface)
cairo_surface_t *
_cairo_paginated_surface_get_target (cairo_surface_t *surface)
{
cairo_paginated_surface_t *paginated_surface;
assert (_cairo_surface_is_paginated (surface));
cairo_paginated_surface_t *paginated_surface =
(cairo_paginated_surface_t *) surface;
paginated_surface = (cairo_paginated_surface_t *) surface;
return paginated_surface->target;
}

2
test/cairo-test.c
View file

@ -190,8 +190,8 @@ create_image_surface (cairo_test_t *test,
cairo_content_t content,
void **closure)
{
*closure = NULL;
cairo_format_t format;
*closure = NULL;
if (content == CAIRO_CONTENT_COLOR_ALPHA) {
format = CAIRO_FORMAT_ARGB32;