[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [MiNT] [Mint-cvs] [FreeMiNT CVS] freemint/xaaes/src.km



On Thu, 2011-01-13 at 08:41 +0000, Helmut Karlowski wrote:
> Alan Hourihane wrote:
> 
> > On Thu, 2011-01-13 at 06:49 +0000, Helmut Karlowski wrote:
> > > Alan Hourihane wrote:
> > >
> > > > Helmut,
> > > >
> > > > This is just wrong!
> > > >
> > > > You don't need (void (*)(PROC *, long arg)) this anymore on trunk.
> > > >
> > > > Please revert and merge in my changes to your branch.
> > >
> > > Well, I got these warnings after updating from your changes!
> > >
> > > ..
> > >
> > > kentry.h:
> > >
> > > struct timeout *_cdecl (*addroottimeout)(long, void (*)(PROC *, long arg), unsigned short);
> > >
> > > ???
> >
> > Eh? You haven't merged my changes into your branch.
> 
> The quote was from cvs-web-interface, latest version of course.

And what does that explain ?

> > I've just done a cvs diff -r helmut-enhancements and can see lots of
> > changes that haven't been merged to your branch from the trunk.
> 
> 
> Sure there are diffs, that's intentional!

Yes, there are diffs, but you are missing the point. I am saying you
have NOT merged in the changes that are relevant for the timeout fixes.

Alan.