[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [MiNT] [Mint-cvs] [FreeMiNT CVS] freemint/xaaes/src.km
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.
Alan.
On Wed, 2011-01-12 at 22:17 +0000, cvs@sparemint.org wrote:
> Update of /mint/freemint/xaaes/src.km
> In directory mail.sparemint.org:/tmp/cvs-serv7236
>
> Modified Files:
> menuwidg.c xa_evnt.c
> Log Message:
> menuwidg.c xa_evnt.c:
> fix compiler-warnings
>
>
> Index: freemint/xaaes/src.km/menuwidg.c
> diff -u freemint/xaaes/src.km/menuwidg.c:1.134 freemint/xaaes/src.km/menuwidg.c:1.135
> --- freemint/xaaes/src.km/menuwidg.c:1.134 Wed Jan 5 07:26:54 2011
> +++ freemint/xaaes/src.km/menuwidg.c Wed Jan 12 17:17:10 2011
> @@ -1,5 +1,5 @@
> /*
> - * $Id: menuwidg.c,v 1.134 2011/01/05 12:26:54 alanh Exp $
> + * $Id: menuwidg.c,v 1.135 2011/01/12 22:17:10 hek Exp $
> *
> * XaAES - XaAES Ain't the AES (c) 1992 - 1998 C.Graham
> * 1999 - 2003 H.Robbers
> @@ -1479,7 +1479,7 @@
> {
> if (!instant && cfg.popout_timeout)
> {
> - t = addroottimeout(cfg.popout_timeout, do_popout_timeout, 1);
> + t = addroottimeout(cfg.popout_timeout, (void (*)(PROC *, long arg))do_popout_timeout, 1);
> if ((S.popout_timeout = t))
> t->arg = (long)tab;
> }
> @@ -1674,7 +1674,7 @@
> {
> TIMEOUT *t;
>
> - t = addroottimeout(cfg.popup_timeout, do_popup_to, 1);
> + t = addroottimeout(cfg.popup_timeout, (void (*)(PROC *, long arg))do_popup_to, 1);
> if (t)
> {
> t->arg = (long)tab;
> @@ -2787,7 +2787,7 @@
>
> if (mb && ret == 1)
> {
> - t = addroottimeout(cfg.menu_settings.mn_set.speed, !ce->d0 ? menu_scrld_to : menu_scrlu_to, 1);
> + t = addroottimeout(cfg.menu_settings.mn_set.speed, !ce->d0 ? (void (*)(PROC *, long arg))menu_scrld_to : (void (*)(PROC *, long arg))menu_scrlu_to, 1);
> if (t)
> t->arg = (long)tab;
> }
> @@ -2849,7 +2849,7 @@
> if (mb)
> {
> TIMEOUT *t;
> - t = addroottimeout(cfg.menu_settings.mn_set.delay, menu_scrld_to, 1);
> + t = addroottimeout(cfg.menu_settings.mn_set.delay, (void (*)(PROC *, long arg))menu_scrld_to, 1);
> if (t)
> t->arg = (long)tab;
> S.menuscroll_timeout = t;
> @@ -2868,7 +2868,7 @@
> if (mb)
> {
> TIMEOUT *t;
> - t = addroottimeout(cfg.menu_settings.mn_set.delay, menu_scrlu_to, 1);
> + t = addroottimeout(cfg.menu_settings.mn_set.delay, (void (*)(PROC *, long arg))menu_scrlu_to, 1);
> if (t)
> t->arg = (long)tab;
> S.menuscroll_timeout = t;
>
> Index: freemint/xaaes/src.km/xa_evnt.c
> diff -u freemint/xaaes/src.km/xa_evnt.c:1.76 freemint/xaaes/src.km/xa_evnt.c:1.77
> --- freemint/xaaes/src.km/xa_evnt.c:1.76 Wed Jan 5 07:26:55 2011
> +++ freemint/xaaes/src.km/xa_evnt.c Wed Jan 12 17:17:10 2011
> @@ -1,5 +1,5 @@
> /*
> - * $Id: xa_evnt.c,v 1.76 2011/01/05 12:26:55 alanh Exp $
> + * $Id: xa_evnt.c,v 1.77 2011/01/12 22:17:10 hek Exp $
> *
> * XaAES - XaAES Ain't the AES (c) 1992 - 1998 C.Graham
> * 1999 - 2003 H.Robbers
> @@ -564,7 +564,9 @@
> *out++ = key;
> *out = mbs.c;
> } else
> + {
> return false;
> + }
>
> got_evnt:
> client->usr_evnt = 1;
> @@ -656,7 +658,7 @@
>
> DIAG((D_i,client,"Timer val: %ld(hi=%d,lo=%d)", client->timer_val, pb->intin[15], pb->intin[14]));
> if (client->timer_val > 5) {
> - client->timeout = addtimeout(client->timer_val, wakeme_timeout);
> + client->timeout = addtimeout(client->timer_val, (void (*)(PROC *, long arg))wakeme_timeout);
> if (client->timeout)
> client->timeout->arg = (long)client;
> } else {
> @@ -712,7 +714,7 @@
> client->waiting_pb = pb;
>
> if (!check_queued_events(client))
> - (*client->block)(client, 1); //Block(client, 1);
> + (*client->block)(client, 2); //Block(client, 1);
>
> return XAC_DONE;
> }
> @@ -738,7 +740,7 @@
> client->waiting_for = MU_BUTTON;
> client->waiting_pb = pb;
> if (!check_queued_events(client))
> - (*client->block)(client, 1); //Block(client, 1);
> + (*client->block)(client, 3); //Block(client, 1);
> return XAC_DONE;
> }
>
> @@ -759,7 +761,7 @@
> client->waiting_for = MU_KEYBD;
> client->waiting_pb = pb;
> if (!check_queued_events(client))
> - (*client->block)(client, 1); //Block(client, 1);
> + (*client->block)(client, 4); //Block(client, 1);
> return XAC_DONE;
> }
>
> @@ -787,7 +789,7 @@
> client->waiting_pb = pb;
>
> if (!check_queued_events(client))
> - (*client->block)(client, 1); //Block(client, 1);
> + (*client->block)(client, 5); //Block(client, 1);
>
> return XAC_DONE;
> }
> @@ -808,11 +810,11 @@
> client->waiting_pb = pb;
> /* Store a pointer to the AESPB to fill when the event occurs */
> client->waiting_for = MU_TIMER;
> - client->timeout = addtimeout(client->timer_val, wakeme_timeout);
> + client->timeout = addtimeout(client->timer_val, (void (*)(PROC *, long arg))wakeme_timeout);
> if (client->timeout) {
> client->timeout->arg = (long)client;
> }
> - (*client->block)(client, 1); //Block(client, 1);
> + (*client->block)(client, 6); //Block(client, 1);
> }
>
> return XAC_DONE;
>
> _______________________________________________
> cz-bobek-lists-mint-cvs mailing list
> mint-cvs@lists.bobek.cz
> https://lists.bobek.cz/mailman/listinfo/cz-bobek-lists-mint-cvs