Merge branch 'mc' into mc++

[simgrid.git] / src / instr / instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 84e81c2..908ecd6 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -1,8 +1,8 @@
-/* Copyright (c) 2010-2013. The SimGrid Team.
+/* Copyright (c) 2010-2014. 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 INSTR_PRIVATE_H_
 #define INSTR_PRIVATE_H_
@@ -14,6 +14,8 @@
 
 #ifdef HAVE_TRACING
 
+SG_BEGIN_DECL()
+
 /* Need to define function drand48 for Windows */
 #ifdef _WIN32
 #  define drand48() (rand()/(RAND_MAX + 1.0))
@@ -230,10 +232,6 @@ extern xbt_dict_t user_vm_variables;
 extern xbt_dict_t user_link_variables;
 extern double TRACE_last_timestamp_to_dump;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* instr_paje_header.c */
 void TRACE_header(int basic, int size);
 
@@ -461,10 +459,7 @@ typedef struct s_instr_extra_data {
   int num_processes;
 } s_instr_extra_data_t;
 
-#ifdef __cplusplus
-}
-#endif
-
+SG_END_DECL()
 
 #endif /* HAVE_TRACING */
 
@@ -472,9 +467,4 @@ typedef struct s_instr_extra_data {
 #include "instr/jedule/jedule_sd_binding.h"
 #endif
 
-
-
-
-
-
 #endif /* INSTR_PRIVATE_H_ */