diff options
author | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
commit | f719abf104e304ed2f886a413d1132a75e3379b1 (patch) | |
tree | 352be6d36f1db3f697394bc193adb7fa8142be71 /include/task.h | |
parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (diff) |
fix merge conflicts
Diffstat (limited to 'include/task.h')
-rw-r--r-- | include/task.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/task.h b/include/task.h index 6c6efdf4f..a71577ee3 100644 --- a/include/task.h +++ b/include/task.h @@ -1,6 +1,10 @@ #ifndef GUARD_TASK_H #define GUARD_TASK_H +// general task defines +#define TASK gTasks[taskId] +#define FUNC func + typedef void (*TaskFunc)(u8 taskId); struct Task |