Cleanups

[simgrid.git] / src / include / smpi / smpi_interface.h

diff --git a/src/include/smpi/smpi_interface.h b/src/include/smpi/smpi_interface.h
index 73dd68d..f9512d9 100644 (file)
--- a/src/include/smpi/smpi_interface.h
+++ b/src/include/smpi/smpi_interface.h
@@ -1,22 +1,23 @@
-/* Copyright (c) 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2012-2017. 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 _SMPI_INTERFACE_H
-#define _SMPI_INTERFACE_H
+#ifndef SMPI_INTERFACE_H
+#define SMPI_INTERFACE_H
 #include "smpi/smpi.h"
 
 SG_BEGIN_DECL()
 
 /** \brief MPI collective description */
 
-typedef struct mpi_coll_description {
+struct mpi_coll_description {
   const char *name;
   const char *description;
   void *coll;
-} s_mpi_coll_description_t, *mpi_coll_description_t;
+};
+typedef struct mpi_coll_description  s_mpi_coll_description_t;
+typedef struct mpi_coll_description* mpi_coll_description_t;
 
 /** \ingroup MPI gather
  *  \brief The list of all available allgather collectives
@@ -92,12 +93,9 @@ XBT_PUBLIC_DATA(int (*mpi_coll_barrier_fun)(MPI_Comm comm));
 XBT_PUBLIC(void) coll_help(const char *category, s_mpi_coll_description_t * table);
 XBT_PUBLIC(int) find_coll_description(s_mpi_coll_description_t * table, char *name, const char *desc);
 
-XBT_PUBLIC_DATA(void) (*smpi_coll_cleanup_callback)(void);
+XBT_PUBLIC_DATA(void) (*smpi_coll_cleanup_callback)();
 XBT_PUBLIC(void) smpi_coll_cleanup_mvapich2(void);
-extern XBT_PRIVATE double smpi_wtime_sleep;
-extern XBT_PRIVATE double smpi_iprobe_sleep;
-extern XBT_PRIVATE double smpi_test_sleep;
 
 SG_END_DECL()
 
-#endif                          /* _SMPI_INTERFAC_H */
+#endif /* SMPI_INTERFACE_H */