[mc] Remove redundant typedefs

Clang complains about typedef redefinitions in pre-C11 mode.

diff --git a/src/mc/mc_forward.h b/src/mc/mc_forward.h
index 58fde4c..267f82c 100644 (file)
--- a/src/mc/mc_forward.h
+++ b/src/mc/mc_forward.h
@@ -8,17 +8,14 @@
 #define MC_FORWARD_H
 
 #include <mc/datatypes.h>
+#include "mc_interface.h"
 
 typedef struct s_mc_object_info s_mc_object_info_t, *mc_object_info_t;
-typedef struct s_mc_transition s_mc_transition_t, *mc_transition_t;
 typedef struct s_dw_type s_dw_type_t, *dw_type_t;
 typedef struct s_memory_map s_memory_map_t, *memory_map_t;
 typedef struct s_dw_variable s_dw_variable_t, *dw_variable_t;
 typedef struct s_dw_frame s_dw_frame_t, *dw_frame_t;
-
 typedef struct s_mc_pages_store s_mc_pages_store_t, *mc_pages_store_t;
-typedef struct s_mc_snapshot s_mc_snapshot_t, *mc_snapshot_t;
-
 typedef struct s_mc_model_checker s_mc_model_checker_t, *mc_model_checker_t;
 extern mc_model_checker_t mc_model_checker;
 

diff --git a/src/mc/mc_interface.h b/src/mc/mc_interface.h
index d4afe68..0bf35d0 100644 (file)
--- a/src/mc/mc_interface.h
+++ b/src/mc/mc_interface.h
@@ -11,7 +11,7 @@
 
 SG_BEGIN_DECL()
 
-typedef struct s_mc_snapshot *mc_snapshot_t;
+typedef struct s_mc_snapshot s_mc_snapshot_t, *mc_snapshot_t;
 
 SG_END_DECL()
 

diff --git a/src/mc/mc_page_store.h b/src/mc/mc_page_store.h
index 45965e7..2f79705 100644 (file)
--- a/src/mc/mc_page_store.h
+++ b/src/mc/mc_page_store.h
@@ -18,6 +18,7 @@
 #include <xbt.h>
 
 #include "mc_mmu.h"
+#include "mc_forward.h"
 
 #ifndef MC_PAGE_STORE_H
 #define MC_PAGE_STORE_H
@@ -212,7 +213,6 @@ size_t s_mc_pages_store::capacity() {
 
 SG_BEGIN_DECL()
 
-typedef struct s_mc_pages_store s_mc_pages_store_t, * mc_pages_store_t;
 mc_pages_store_t mc_pages_store_new(void);
 void mc_pages_store_delete(mc_pages_store_t store);