Mercurial > hg > early-roguelike

diff srogue/daemon.c @ 239:837044d2c362

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge the GCC5 and build fix branches. This fixes all warnings produced by GCC 5, except the ones related to system functions. Those could be fixed by including the proper headers, but it would be better to replace the system-dependent code with functions from mdport.c.
author John "Elwin" Edwards
date Fri, 11 Mar 2016 19:47:52 -0500
parents b67b99f6c92b
children
line wrap: on
line diff
--- a/srogue/daemon.c	Tue Mar 08 19:45:41 2016 -0500
+++ b/srogue/daemon.c	Fri Mar 11 19:47:52 2016 -0500
@@ -34,7 +34,7 @@
  *	Insert a function in the daemon list.
  */
 struct delayed_action *
-d_insert(int (*func)(), int arg, int type, int time)
+d_insert(void (*func)(), int arg, int type, int time)
 {
 	reg struct delayed_action *dev;
 
@@ -72,7 +72,7 @@
  *	Find a particular slot in the table
  */
 struct delayed_action *
-find_slot(int (*func)())
+find_slot(void (*func)())
 {
 	reg struct delayed_action *dev;
 
@@ -87,7 +87,7 @@
  *	Start a daemon, takes a function.
  */
 void
-start_daemon(int (*func)(), int arg, int type)
+start_daemon(void (*func)(), int arg, int type)
 {
 	d_insert(func, arg, type, DAEMON);
 }
@@ -112,7 +112,7 @@
  *	Start a fuse to go off in a certain number of turns
  */
 void
-fuse(int (*func)(), int arg, int time)
+fuse(void (*func)(), int arg, int time)
 {
 	d_insert(func, arg, AFTER, time);
 }
@@ -122,7 +122,7 @@
  *	Increase the time until a fuse goes off
  */
 void
-lengthen(int (*func)(), int xtime)
+lengthen(void (*func)(), int xtime)
 {
 	reg struct delayed_action *wire;
 
@@ -136,7 +136,7 @@
  *	Put out a fuse. Find all such fuses and kill them.
  */
 void
-extinguish(int (*func)())
+extinguish(void (*func)())
 {
 	reg struct delayed_action *dev;