diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 04:52:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 04:52:28 +0300 |
commit | b45c3363fd65a734a87d0917988fda6ae9d9df3c (patch) | |
tree | 71a86ce7388b6b1829d06a48547943890363325a /source/blender/windowmanager | |
parent | 9e5577db47c8b9c85d49bec0e0b8050dcae0b513 (diff) |
fix for some pedantic warnings.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_jobs.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_cursors.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 405db630932..3c86d0d4d45 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -332,7 +332,7 @@ void WM_jobs_callbacks(struct wmJob *, void WM_jobs_start(struct wmWindowManager *wm, struct wmJob *); void WM_jobs_stop(struct wmWindowManager *wm, void *owner, void *startjob); -void WM_jobs_kill(struct wmWindowManager *wm, void *owner, void *startjob); +void WM_jobs_kill(struct wmWindowManager *wm, void *owner, void (*)(void *, short int *, short int *, float *)); void WM_jobs_stop_all(struct wmWindowManager *wm); /* clipboard */ diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 3ebfac4928c..71e20e301b8 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -351,7 +351,7 @@ void WM_jobs_stop(wmWindowManager *wm, void *owner, void *startjob) } /* actually terminate thread and job timer */ -void WM_jobs_kill(wmWindowManager *wm, void *owner, void *startjob) +void WM_jobs_kill(wmWindowManager *wm, void *owner, void (*startjob)(void *, short int *, short int *, float *)) { wmJob *steve; diff --git a/source/blender/windowmanager/wm_cursors.h b/source/blender/windowmanager/wm_cursors.h index 178a5f55ba4..c42e7413f1a 100644 --- a/source/blender/windowmanager/wm_cursors.h +++ b/source/blender/windowmanager/wm_cursors.h @@ -47,7 +47,7 @@ enum { CURSOR_STD, CURSOR_NONE, CURSOR_PENCIL, - CURSOR_COPY, + CURSOR_COPY }; |