Browse Source

generalise the compilation of extern inlines

Samuel Thibault 13 years ago
parent
commit
d0ce4fee24
3 changed files with 16 additions and 16 deletions
  1. 1 1
      src/Makefile.am
  2. 1 1
      src/util/starpu_task_list.c
  3. 14 14
      src/util/starpu_task_list_inline.h

+ 1 - 1
src/Makefile.am

@@ -195,7 +195,7 @@ libstarpu_@STARPU_EFFECTIVE_VERSION@_la_SOURCES = 						\
 	util/starpu_data_cpy.c					\
 	util/starpu_insert_task.c				\
 	util/starpu_insert_task_utils.c				\
-	util/starpu_task_list.c					\
+	util/starpu_inlines.c					\
 	debug/traces/starpu_fxt.c				\
 	debug/traces/starpu_fxt_mpi.c				\
 	debug/traces/starpu_fxt_dag.c				\

+ 1 - 1
src/util/starpu_task_list.c

@@ -14,5 +14,5 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
-#define STARPU_TASK_LIST_INLINE
+#define STARPU_INLINE
 #include <starpu.h>

+ 14 - 14
src/util/starpu_task_list_inline.h

@@ -16,18 +16,18 @@
 
 #include <starpu.h>
 
-#ifndef STARPU_TASK_LIST_INLINE
-#define STARPU_TASK_LIST_INLINE extern inline
+#ifndef STARPU_INLINE
+#define STARPU_INLINE extern inline
 #endif
 
-STARPU_TASK_LIST_INLINE
+STARPU_INLINE
 void starpu_task_list_init(struct starpu_task_list *list)
 {
 	list->head = NULL;
 	list->tail = NULL;
 }
 
-STARPU_TASK_LIST_INLINE
+STARPU_INLINE
 void starpu_task_list_push_front(struct starpu_task_list *list,
 				struct starpu_task *task)
 {
@@ -45,7 +45,7 @@ void starpu_task_list_push_front(struct starpu_task_list *list,
 	list->head = task;
 }
 
-STARPU_TASK_LIST_INLINE
+STARPU_INLINE
 void starpu_task_list_push_back(struct starpu_task_list *list,
 				struct starpu_task *task)
 {
@@ -63,25 +63,25 @@ void starpu_task_list_push_back(struct starpu_task_list *list,
 	list->tail = task;
 }
 
-STARPU_TASK_LIST_INLINE
+STARPU_INLINE
 struct starpu_task *starpu_task_list_front(struct starpu_task_list *list)
 {
 	return list->head;
 }
 
-STARPU_TASK_LIST_INLINE
+STARPU_INLINE
 struct starpu_task *starpu_task_list_back(struct starpu_task_list *list)
 {
 	return list->tail;
 }
 
-STARPU_TASK_LIST_INLINE
+STARPU_INLINE
 int starpu_task_list_empty(struct starpu_task_list *list)
 {
 	return (list->head == NULL);
 }
 
-STARPU_TASK_LIST_INLINE
+STARPU_INLINE
 void starpu_task_list_erase(struct starpu_task_list *list,
 				struct starpu_task *task)
 {
@@ -109,7 +109,7 @@ void starpu_task_list_erase(struct starpu_task_list *list,
 	task->next = NULL;
 }
 
-STARPU_TASK_LIST_INLINE
+STARPU_INLINE
 struct starpu_task *starpu_task_list_pop_front(struct starpu_task_list *list)
 {
 	struct starpu_task *task = list->head;
@@ -120,7 +120,7 @@ struct starpu_task *starpu_task_list_pop_front(struct starpu_task_list *list)
 	return task;
 }
 
-STARPU_TASK_LIST_INLINE
+STARPU_INLINE
 struct starpu_task *starpu_task_list_pop_back(struct starpu_task_list *list)
 {
 	struct starpu_task *task = list->tail;
@@ -131,19 +131,19 @@ struct starpu_task *starpu_task_list_pop_back(struct starpu_task_list *list)
 	return task;
 }
 
-STARPU_TASK_LIST_INLINE
+STARPU_INLINE
 struct starpu_task *starpu_task_list_begin(struct starpu_task_list *list)
 {
 	return list->head;
 }
 
-STARPU_TASK_LIST_INLINE
+STARPU_INLINE
 struct starpu_task *starpu_task_list_end(struct starpu_task_list *list __attribute__ ((unused)))
 {
 	return NULL;
 }
 
-STARPU_TASK_LIST_INLINE
+STARPU_INLINE
 struct starpu_task *starpu_task_list_next(struct starpu_task *task)
 {
 	return task->next;