diff options
author | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
commit | 4aa1b44315ee26fa60015a99ccd51f900e5597fd (patch) | |
tree | fdcac19f28b2e4febd96a895e72fce122b9e3b15 /include/task.h | |
parent | ad7a7222a538380b446f9aecde44c5222ff3b68a (diff) | |
parent | e39f55f55080108ced3ff5cb16b2181d7fec9d92 (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 |