summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--amiga/menu.c2
-rwxr-xr-xamiga/schedule.c5
-rw-r--r--amiga/tree.c2
-rwxr-xr-xatari/schedule.c2
-rw-r--r--cocoa/schedule.m2
-rw-r--r--windows/schedule.c7
6 files changed, 14 insertions, 6 deletions
diff --git a/amiga/menu.c b/amiga/menu.c
index 9cb857e9d..13b9c9c24 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -484,7 +484,7 @@ struct NewMenu *ami_create_menu(struct gui_window_2 *gwin)
if(nsoption_int(menu_refresh) > 0)
{
ami_schedule(nsoption_int(menu_refresh) * 10,
- ami_menu_refresh,
+ (void *)ami_menu_refresh,
gwin);
}
diff --git a/amiga/schedule.c b/amiga/schedule.c
index 4ec9df7e9..9aa74881f 100755
--- a/amiga/schedule.c
+++ b/amiga/schedule.c
@@ -17,7 +17,6 @@
*/
#include "amiga/os3support.h"
-#include "amiga/schedule.h"
#include <proto/exec.h>
#include <proto/timer.h>
@@ -26,6 +25,10 @@
#include <stdbool.h>
#include <pbl.h>
+#include "utils/errors.h"
+
+#include "amiga/schedule.h"
+
struct nscallback
{
struct TimeVal tv;
diff --git a/amiga/tree.c b/amiga/tree.c
index fa1252831..df6ac9bb3 100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -1396,5 +1396,5 @@ void ami_tree_redraw_request(int x, int y, int width, int height, void *data)
if(nsoption_bool(direct_render) == false)
ami_schedule(0, ami_tree_redraw_req, atrr_data);
else
- am_schedule(0, ami_tree_redraw_req_dr, atrr_data);
+ ami_schedule(0, ami_tree_redraw_req_dr, atrr_data);
}
diff --git a/atari/schedule.c b/atari/schedule.c
index 02a376245..3bef573a5 100755
--- a/atari/schedule.c
+++ b/atari/schedule.c
@@ -22,6 +22,8 @@
#include <sys/time.h>
#include <time.h>
+#include "utils/errors.h"
+
#include "atari/schedule.h"
#ifdef DEBUG_SCHEDULER
diff --git a/cocoa/schedule.m b/cocoa/schedule.m
index 2dd9a81f6..f0896bd9d 100644
--- a/cocoa/schedule.m
+++ b/cocoa/schedule.m
@@ -18,6 +18,8 @@
#import <Cocoa/Cocoa.h>
+#import "utils/errors.h"
+
#import "cocoa/schedule.h"
@interface ScheduledCallback : NSObject {
diff --git a/windows/schedule.c b/windows/schedule.c
index f819918ba..4aac981ef 100644
--- a/windows/schedule.c
+++ b/windows/schedule.c
@@ -19,10 +19,11 @@
#include <sys/time.h>
#include <time.h>
-#include "windows/schedule.h"
-
#include "utils/log.h"
#include "utils/utils.h"
+#include "utils/errors.h"
+
+#include "windows/schedule.h"
#ifdef DEBUG_SCHEDULER
#define SRLOG(x) LOG(x)
@@ -110,7 +111,7 @@ nserror win32_schedule(int ival, void (*callback)(void *p), void *p)
}
tv.tv_sec = ival / 1000; /* miliseconds to seconds */
- tv.tv_usec = (cs_ival % 1000) * 1000; /* remainder to microseconds */
+ tv.tv_usec = (ival % 1000) * 1000; /* remainder to microseconds */
nscb = calloc(1, sizeof(struct nscallback));
if (nscb == NULL) {