Compiling garnome with gcc 2.95.3

[Bernd Muent <muent euroscript-ls de>]

First of all: Sorry for forgetting to change the subject of my first posting.

Jens Bech Madsen schrieb:

> According to Jeff Waugh it is supposed to compile with 2.95. So the best
> solution is to fix the code and submit a patch with the fix.

I managed it in several function, but here I don't know what to do:

make[8]: Entering directory 
`/usr/src/garnome-0.25.1/gnome/libcroco/work/main.d/libcroco-0.3.0/src/layeng'
/bin/sh ../../libtool --mode=compile cc -DHAVE_CONFIG_H -I. -I. -I../.. -I../.. 
-I../../src/parser -I../../src/seleng -I../../intl 
-I/opt/gnome2_2_2/include/glib-2.0 -I/opt/gnome2_2_2/lib/glib-2.0/include 
-I/opt/gnome2_2_2/include/libxml2   -DORBIT2=1 -pthread 
-I/opt/gnome2_2_2/include/libgnomeui-2.0 -I/opt/gnome2_2_2/include/libgnome-2.0 
-I/opt/gnome2_2_2/include/libgnomecanvas-2.0 -I/opt/gnome2_2_2/include/gtk-2.0 
-I/opt/gnome2_2_2/include/libart-2.0 -I/opt/gnome2_2_2/include/gconf/2 
-I/opt/gnome2_2_2/include/libbonoboui-2.0 -I/opt/gnome2_2_2/include/glib-2.0 
-I/opt/gnome2_2_2/lib/glib-2.0/include -I/opt/gnome2_2_2/include/orbit-2.0 
-I/opt/gnome2_2_2/include/libbonobo-2.0 -I/opt/gnome2_2_2/include/gnome-vfs-2.0 
-I/opt/gnome2_2_2/lib/gnome-vfs-2.0/include 
-I/opt/gnome2_2_2/include/bonobo-activation-2.0 
-I/opt/gnome2_2_2/include/pango-1.0 -I/opt/gnome2_2_2/include 
-I/opt/gnome2_2_2/include/freetype2 -I/opt/gnome2_2_2/lib/gtk-2.0/include 
-I/opt/gnome2_2_2/include/atk-1.0 -I/usr/X11R6/include 
-I/opt/gnome2_2_2/include/libxml2    -I/opt/gnome2_2_2/include 
-I/usr/X11R6/include  -g -I/opt/gnome2_2_2/include -I/usr/X11R6/include 
-L/opt/gnome2_2_2/lib -L/usr/X11R6/lib -O2 -pipe -Wall -c cr-lay-eng.c
cc -DHAVE_CONFIG_H -I. -I. -I../.. -I../.. -I../../src/parser -I../../src/seleng 
-I../../intl -I/opt/gnome2_2_2/include/glib-2.0 
-I/opt/gnome2_2_2/lib/glib-2.0/include -I/opt/gnome2_2_2/include/libxml2 
-DORBIT2=1 -pthread -I/opt/gnome2_2_2/include/libgnomeui-2.0 
-I/opt/gnome2_2_2/include/libgnome-2.0 
-I/opt/gnome2_2_2/include/libgnomecanvas-2.0 -I/opt/gnome2_2_2/include/gtk-2.0 
-I/opt/gnome2_2_2/include/libart-2.0 -I/opt/gnome2_2_2/include/gconf/2 
-I/opt/gnome2_2_2/include/libbonoboui-2.0 -I/opt/gnome2_2_2/include/glib-2.0 
-I/opt/gnome2_2_2/lib/glib-2.0/include -I/opt/gnome2_2_2/include/orbit-2.0 
-I/opt/gnome2_2_2/include/libbonobo-2.0 -I/opt/gnome2_2_2/include/gnome-vfs-2.0 
-I/opt/gnome2_2_2/lib/gnome-vfs-2.0/include 
-I/opt/gnome2_2_2/include/bonobo-activation-2.0 
-I/opt/gnome2_2_2/include/pango-1.0 -I/opt/gnome2_2_2/include 
-I/opt/gnome2_2_2/include/freetype2 -I/opt/gnome2_2_2/lib/gtk-2.0/include 
-I/opt/gnome2_2_2/include/atk-1.0 -I/usr/X11R6/include 
-I/opt/gnome2_2_2/include/libxml2 -I/opt/gnome2_2_2/include -I/usr/X11R6/include 
-g -I/opt/gnome2_2_2/include -I/usr/X11R6/include -L/opt/gnome2_2_2/lib 
-L/usr/X11R6/lib -O2 -pipe -Wall -c cr-lay-eng.c  -fPIC -DPIC -o cr-lay-eng.lo
cr-lay-eng.c: In function `layout_block_box':
cr-lay-eng.c:1221: parse error before `*'
cr-lay-eng.c:1223: `cont_box' undeclared (first use in this function)
cr-lay-eng.c:1223: (Each undeclared identifier is reported only once
cr-lay-eng.c:1223: for each function it appears in.)
make[8]: *** [cr-lay-eng.lo] Error 1
make[8]: Leaving directory 
`/usr/src/garnome-0.25.1/gnome/libcroco/work/main.d/libcroco-0.3.0/src/layeng'
make[7]: *** [all-recursive] Error 1
make[7]: Leaving directory 
`/usr/src/garnome-0.25.1/gnome/libcroco/work/main.d/libcroco-0.3.0/src'
make[6]: *** [all-recursive] Error 1
make[6]: Leaving directory 
`/usr/src/garnome-0.25.1/gnome/libcroco/work/main.d/libcroco-0.3.0'
make[5]: *** [all-recursive-am] Error 2
make[5]: Leaving directory 
`/usr/src/garnome-0.25.1/gnome/libcroco/work/main.d/libcroco-0.3.0'
make[4]: *** [build-work/main.d/libcroco-0.3.0/Makefile] Error 2
make[4]: Leaving directory `/usr/src/garnome-0.25.1/gnome/libcroco'

The problem function is:

layout_block_box (CRLayEng *a_this,
                  CRBox *a_cur_box)
{
        enum CRStatus status = CR_OK ;

        g_return_val_if_fail (a_cur_box && a_cur_box->style,
                              CR_BAD_PARAM_ERROR) ;

        CRBox *cont_box = a_cur_box->parent ;

        if (!cont_box)
        {
                a_cur_box->outer_edge.x = 0 ;
                a_cur_box->outer_edge.y = 0 ;
                a_cur_box->inner_edge.width = 800 ;
                a_cur_box->inner_edge.height = 600 ;
                a_cur_box->inner_edge.max_width = 800 ;
        }
        else
        {
                a_cur_box->outer_edge.x =
                        cont_box->inner_edge.x ;
                if (a_cur_box->prev)
                {
                        a_cur_box->outer_edge.y =
                                get_box_bottommost_y (a_cur_box->prev) ;
                }
                else
                {
                        a_cur_box->outer_edge.y =
                                cont_box->inner_edge.y ;
                }
        }

        g_return_val_if_fail (a_cur_box->parent->inner_edge.max_width
                              + a_cur_box->parent->inner_edge.x
                              > a_cur_box->outer_edge.x,
                              CR_ERROR) ;

        status = compute_and_set_box_dimensions (a_this,
                                                 a_cur_box) ;
        return status ;
}

Any ideas?

Bernd

--
Bernd Münt                         Durchwahl: 030/69032-509
euroscript Language Services GmbH  Zentrale:  030/69032-300
Abteilung IT-Management            Fax:       030/69032-333
Grimmstr. 23                       Mail: muent euroscript-ls de
10967 Berlin                       Web:  http://www.euroscript-ls.de