Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / xbt / fifo_private.h

diff --git a/src/xbt/fifo_private.h b/src/xbt/fifo_private.h
index 26f5cc0..9c40bed 100644 (file)
--- a/src/xbt/fifo_private.h
+++ b/src/xbt/fifo_private.h
@@ -1,11 +1,12 @@
-/* Authors: Arnaud Legrand                                                  */
+/* Copyright (c) 2004, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
-   under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #ifndef _XBT_FIFO_PRIVATE_H
 #define _XBT_FIFO_PRIVATE_H
-#include "xbt_fifo.h"
+#include "xbt/fifo.h"
 
 /* Bucket structure */
 typedef struct xbt_fifo_item {
@@ -26,6 +27,7 @@ typedef struct xbt_fifo {
 #define xbt_fifo_getNextitem(i) ((i)?(i)->next:NULL)
 #define xbt_fifo_getPrevitem(i) ((i)?(i)->prev:NULL)
 #define xbt_fifo_getItemcontent(i) ((i)?(i)->content:NULL)
+#define xbt_fifo_Itemcontent(i) ((i)->content)
 #define xbt_fifo_setItemcontent(i,v) (i->content=v)
 
 
@@ -44,4 +46,4 @@ typedef struct xbt_fifo {
 /*   return NULL; */
 /* } */
 
-#endif                         /* _XBT_FIFO_PRIVATE_H */
+#endif                          /* _XBT_FIFO_PRIVATE_H */