--Apple-Mail-5-175130141
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	format=flowed

Am 06.05.2006 02:29 schrieb Thomas Klausner:

>> graphics/py-cairo                  leuzi@trash.net
>
>  pycairo-font.c: In function `scaled_font_new':
>  pycairo-font.c:207: parse error before `*'
>  pycairo-font.c:208: `o' undeclared (first use in this function)
>  pycairo-font.c:208: (Each undeclared identifier is reported only once
>  pycairo-font.c:208: for each function it appears in.)
>  pycairo-font.c:220: warning: control reaches end of non-void function

A gcc 2.x problem again. The attached patch (untested again, sorry) 
should fix it. I don't know if there are more occurrences of such 
declarations and if it is a good idea to patch them all, especially now 
that 1.6 is EOL'd. If we don't patch them we should remove the last 
patch I submitted for the package's Makefile again, though, and thereby 
breaking all platforms using gcc 2.x or another C99-unaware compiler.

Christoph


--Apple-Mail-5-175130141
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="pycairo-font.diff"
Content-Disposition: attachment;
	filename=pycairo-font.diff

--- cairo/pycairo-font.c.orig	Sat May 20 15:37:36 2006
+++ cairo/pycairo-font.c	Sat May 20 15:38:22 2006
@@ -196,6 +196,7 @@
     PycairoFontFace *ff;
     PycairoFontOptions *fo;
     PycairoMatrix *mx1, *mx2;
+    PyObject *o;
 
     if (!PyArg_ParseTuple(args, "O!O!O!O!:ScaledFont.__new__",
 			  &PycairoFontFace_Type, &ff,
@@ -204,7 +205,7 @@
 			  &PycairoFontOptions_Type, &fo))
 	return NULL;
 
-    PyObject *o = type->tp_alloc(type, 0);
+    o = type->tp_alloc(type, 0);
     if (o) {
 	cairo_scaled_font_t *scaled_font = cairo_scaled_font_create
 	    (ff->font_face, &mx1->matrix, &mx2->matrix, fo->font_options);

--Apple-Mail-5-175130141--