Mercurial > hg > CbC > old > DPP
diff queue.h @ 2:b15128ab0324
Fix dpp2 for cbc using LLVM 3.7
| author | Yasutaka Higa <e115763@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Wed, 16 Dec 2015 17:16:29 +0900 |
| parents | d4bc23cb728b |
| children | a04eccfc69ae |
line wrap: on
line diff
--- a/queue.h Wed Dec 16 16:52:16 2015 +0900 +++ b/queue.h Wed Dec 16 17:16:29 2015 +0900 @@ -1,7 +1,7 @@ /* OS Scheduler Simulator -** 連絡先： 琉球大学情報工学科 河野 真治 +** 連絡先： 琉球大学情報工学科 河野 真治 ** （E-Mail Address: kono@ie.u-ryukyu.ac.jp） ** ** このソースのいかなる複写，改変，修正も許諾します。ただし、 @@ -11,10 +11,10 @@ ** バイナリの配布の際にはversion messageを保存することを条件とします。 ** このプログラムについては特に何の保証もしない、悪しからず。 ** -** Everyone is permitted to do anything on this program +** Everyone is permitted to do anything on this program ** including copying, modifying, improving, ** as long as you don't try to pretend that you wrote it. -** i.e., the above copyright notice has to appear in all copies. +** i.e., the above copyright notice has to appear in all copies. ** Binary distribution requires original version messages. ** You don't have to ask before copying, redistribution or publishing. ** THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE. @@ -42,7 +42,7 @@ } TaskIterator, *TaskIteratorPtr; extern TaskIteratorPtr -create_task_iterator(TaskPtr list,struct state *s,TaskIteratorPtr prev); +create_task_iterator(TaskPtr list,StateDB s,TaskIteratorPtr prev); extern TaskPtr next_task_iterator(TaskIteratorPtr self); @@ -50,19 +50,19 @@ extern void free_task_iterator(TaskIteratorPtr iter); -extern -code create_queue(int count, PhilsPtr self, TaskPtr list, TaskPtr last, - code (*dest)( +extern +__code create_queue(int count, PhilsPtr self, TaskPtr list, TaskPtr last, + __code (*dest)( int count,PhilsPtr self, TaskPtr list,TaskPtr last, TaskPtr q )); extern -code enqueue(int count, PhilsPtr self, TaskPtr list, TaskPtr last, TaskPtr q, - code (*dest)( - int count, PhilsPtr self, TaskPtr list, TaskPtr last, TaskPtr q, - )); +__code enqueue(int count, PhilsPtr self, TaskPtr list, TaskPtr last, TaskPtr q, + __code (*dest)( + int count, PhilsPtr self, TaskPtr list, TaskPtr last + )); extern void free_queue(TaskPtr q); -extern code dequeue(code (*dest)(), TaskPtr list, TaskPtr *q); +extern __code dequeue(__code (*dest)(), TaskPtr list); #endif