merge conflicts

[simgrid.git] / src / include / surf / datatypes.h

diff --git a/src/include/surf/datatypes.h b/src/include/surf/datatypes.h
index 1cc0de5..bac2778 100644 (file)
--- a/src/include/surf/datatypes.h
+++ b/src/include/surf/datatypes.h
@@ -1,4 +1,5 @@
-/* Copyright (c) 2009 The SimGrid team. All rights reserved.                */
+/* Copyright (c) 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. */
@@ -28,8 +29,7 @@ typedef struct lmm_constraint *lmm_constraint_t;
 typedef struct lmm_system *lmm_system_t;
 
 typedef struct tmgr_history *tmgr_history_t;
-typedef struct tmgr_trace *tmgr_trace_t;
 typedef struct tmgr_trace_event *tmgr_trace_event_t;
 
 
-#endif /* MAXMIN_DATATYPES_H */
+#endif                          /* MAXMIN_DATATYPES_H */