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

[Alan Hourihane <alanh@fairlite.co.uk>]

On Thu, 2011-01-13 at 09:01 +0000, Helmut Karlowski wrote:
> Alan Hourihane wrote:
> 
> > > > > 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 ?
> 
> That there's a mess in /sys

Please 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.
> 
> Yes I have! After that there were compiler-warnings, as I said before.

No. You haven't look....

To look at your branch do....

cvs update -r helmut-enhancements

Then to diff against the trunk do....

cvs diff -r HEAD sys/mint/kentry.h 

And this is what it produces....

Index: kentry.h
===================================================================
RCS file: /mint/freemint/sys/mint/kentry.h,v
retrieving revision 1.39
retrieving revision 1.36
diff -u -r1.39 -r1.36
--- kentry.h	5 Jan 2011 12:13:34 -0000	1.39
+++ kentry.h	4 Jan 2010 22:22:11 -0000	1.36
@@ -1,5 +1,5 @@
 /*
- * $Id: kentry.h,v 1.39 2011/01/05 12:13:34 alanh Exp $
+ * $Id: kentry.h,v 1.36 2010/01/04 22:22:11 alanh Exp $
  * 
  * This file belongs to FreeMiNT. It's not in the original MiNT 1.12
  * distribution. See the file CHANGES for a detailed log of changes.
@@ -225,9 +225,9 @@
 	 *
 	 * same as canceltimeout() but for root timeouts
 	 */
-	struct timeout *_cdecl (*addtimeout)(long, void (*)(PROC *, long
arg));
+	struct timeout *_cdecl (*addtimeout)(long, void (*)());
 	void _cdecl (*canceltimeout)(struct timeout *);
-	struct timeout *_cdecl (*addroottimeout)(long, void (*)(PROC *, long
arg), unsigned short);
+	struct timeout *_cdecl (*addroottimeout)(long, void (*)(), unsigned
short);
 	void _cdecl (*cancelroottimeout)(struct timeout *);
 
 	/* create a new process */

So you haven't merged them in.

Alan.