I downloaded the latest CVS seperate from my own modifications and tried
to compile. I am still recieving the error:
panel.cxx: In method `const char *FGTextLayer::Chunk::getValue ()
const':
panel.cxx:1128: `truncf' undeclared (first use this function)
panel.cxx:1128: (Each undeclared identifier is reported only once for
each function it appears in.)
make[3]: *** [panel.o] Error 1
make[3]: Leaving directory
`/home/grads/carrolls/downloads/flightgear/FlightGear/src/Cockpit'
Any suggestions would be appreciated,
Seamus
On Thu, 19 Feb 2004, Melchior FRANZ wrote:
> * Seamus Thomas Carroll -- Thursday 19 February 2004 01:16:
> > C src/Main/Makefile.am
> > M src/Main/bootstrap.cxx
> > M src/Main/fg_commands.cxx
> > M src/Main/fg_init.cxx
> > M src/Main/globals.cxx
> > M src/Main/globals.hxx
> > C src/Main/main.cxx
>
> The 'C' means that cvs couldn't cleanly merge the version from the repository
> into yours. You have to open all the files marked with C and search for
> places like this:
>
> <<<<<<< bar.cxx
> foo
> =======
> bar
> >>>>>>> 1.20
>
> Then replace these lines with "foo" or "bar". IOW: you have to decide if you
> prefer your version (foo) or the one from the repository ("bar").
> Alternatively, you can call "cvs up -C" and let cvs overwrite all your
> changes. They aren't really lost, though, but saved in hidden files.
>
> m.
>
> _______________________________________________
> Flightgear-devel mailing list
> [EMAIL PROTECTED]
> http://mail.flightgear.org/mailman/listinfo/flightgear-devel
>
_______________________________________________
Flightgear-devel mailing list
[EMAIL PROTECTED]
http://mail.flightgear.org/mailman/listinfo/flightgear-devel
