X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4afde5a12341a68569e8c15d06a799d3b26338e9..e6ca184e99d50d0ee8fe405a83ee5277e2ecfce6:/src/mc/mc_forward.h

diff --git a/src/mc/mc_forward.h b/src/mc/mc_forward.h
index 55a3a751ee..40d9993b0e 100644
--- a/src/mc/mc_forward.h
+++ b/src/mc/mc_forward.h
@@ -1,30 +1,30 @@
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. 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. */
 
-#ifndef MC_FORWARD_H
-#define MC_FORWARD_H
+/** \file mc_forward.h
+ *
+ *  Define type names for pointers of MC objects for the C code
+ */
 
-#include <xbt/misc.h>
-#include <mc/datatypes.h>
+#ifndef SIMGRID_MC_FORWARD_H
+#define SIMGRID_MC_FORWARD_H
 
-SG_BEGIN_DECL()
+#ifdef __cplusplus
 
-typedef struct s_mc_object_info s_mc_object_info_t, *mc_object_info_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;
+// If we're in C++, we give the real definition:
+#include "mc_forward.hpp"
+typedef simgrid::mc::Snapshot *mc_snapshot_t;
+typedef simgrid::mc::Type *mc_type_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;
+#else
 
-typedef struct s_mc_process s_mc_process_t, * mc_process_t;
-typedef struct s_mc_model_checker s_mc_model_checker_t, *mc_model_checker_t;
-extern mc_model_checker_t mc_model_checker;
+// Otherwise we use dummy opaque structs:
+typedef struct _mc_snapshot_t *mc_snapshot_t;
+typedef struct _s_mc_type_t *mc_type_t;
 
-SG_END_DECL()
+#endif
 
 #endif