Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --cc include/simgrid/msg.h
Simple merge

diff --cc include/xbt/sysdep.h
Simple merge

diff --cc src/include/smpi/smpi_interface.h
index 916165e,6f6c9d0..d012318
--- 1/src/include/smpi/smpi_interface.h
--- 2/src/include/smpi/smpi_interface.h
+++ b/src/include/smpi/smpi_interface.h
@@@ -94,8 -94,8 +94,8 @@@ XBT_PUBLIC_DATA(int (*mpi_coll_barrier_
  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();
+ XBT_PUBLIC(void) smpi_coll_cleanup_mvapich2(void);
  
  SG_END_DECL()
  

diff --cc src/simgrid/sg_config.cpp
Simple merge

diff --cc src/smpi/colls/smpi_mvapich2_selector.c
index f4c2ea7,f4c2ea7..9e64ac3
--- 1/src/smpi/colls/smpi_mvapich2_selector.c
--- 2/src/smpi/colls/smpi_mvapich2_selector.c
+++ b/src/smpi/colls/smpi_mvapich2_selector.c
@@@ -82,8 -82,8 +82,6 @@@ int smpi_coll_tuned_alltoall_mvapich2( 
    return (mpi_errno);
  }
  
--
--
  int smpi_coll_tuned_allgather_mvapich2(void *sendbuf, int sendcount, MPI_Datatype sendtype,
      void *recvbuf, int recvcount, MPI_Datatype recvtype,
      MPI_Comm comm)
@@@ -1006,8 -1006,8 +1004,7 @@@ int smpi_coll_tuned_scatter_mvapich2(vo
    return (mpi_errno);
  }
  
--
--void smpi_coll_cleanup_mvapich2(){
++void smpi_coll_cleanup_mvapich2(void){
  int i=0;
  if(mv2_alltoall_thresholds_table)
    xbt_free(mv2_alltoall_thresholds_table[i]);
@@@ -1022,7 -1022,7 +1019,6 @@@ xbt_free(mv2_size_allgather_tuning_tabl
  xbt_free(mv2_allgather_table_ppn_conf);
  xbt_free(mv2_allgather_thresholds_table);
  
--
  xbt_free(mv2_allgatherv_thresholds_table);
  xbt_free(mv2_reduce_thresholds_table);
  xbt_free(mv2_red_scat_thresholds_table);
@@@ -1034,4 -1034,4 +1030,3 @@@ xbt_free(mv2_scatter_thresholds_table)
  xbt_free(mv2_size_scatter_tuning_table);
  xbt_free(mv2_scatter_table_ppn_conf);
  }
--

diff --cc src/surf/surf_interface.cpp
Simple merge

diff --cc src/xbt/automaton/automaton.c
index 9e8044c,9e8044c..2813415
--- 1/src/xbt/automaton/automaton.c
--- 2/src/xbt/automaton/automaton.c
+++ b/src/xbt/automaton/automaton.c
@@@ -20,7 -20,7 +20,7 @@@ struct xbt_automaton_propositional_symb
    void (*free_function)(void*);
  };
  
--xbt_automaton_t xbt_automaton_new(){
++xbt_automaton_t xbt_automaton_new(void){
    xbt_automaton_t automaton = NULL;
    automaton = xbt_new0(struct xbt_automaton, 1);
    automaton->states = xbt_dynar_new(sizeof(xbt_automaton_state_t), xbt_automaton_state_free_voidp);

diff --cc src/xbt/fifo.c
index 8cd20e0,8cd20e0..3f6714b
--- 1/src/xbt/fifo.c
--- 2/src/xbt/fifo.c
+++ b/src/xbt/fifo.c
@@@ -559,13 -559,13 +559,13 @@@ xbt_fifo_item_t xbt_fifo_getPrevItem(xb
   * These are internal XBT functions called by xbt_preinit/postexit().
   * It can be used several times to recreate the mallocator, for example when you switch to MC mode
   */
--void xbt_fifo_preinit(void)
++void xbt_fifo_preinit()
  {
    item_mallocator = xbt_mallocator_new(65536, fifo_item_mallocator_new_f,
                                         fifo_item_mallocator_free_f, fifo_item_mallocator_reset_f);
  }
  
--void xbt_fifo_postexit(void)
++void xbt_fifo_postexit()
  {
    if (item_mallocator != NULL) {
      xbt_mallocator_free(item_mallocator);

diff --cc src/xbt/xbt_os_thread.c
index c66cbfc,c66cbfc..07e3202
--- 1/src/xbt/xbt_os_thread.c
--- 2/src/xbt/xbt_os_thread.c
+++ b/src/xbt/xbt_os_thread.c
@@@ -250,7 -250,7 +250,7 @@@ void xbt_os_thread_exit(int *retval
    pthread_exit(retval);
  }
  
--xbt_os_thread_t xbt_os_thread_self(void)
++xbt_os_thread_t xbt_os_thread_self(void )
  {
    if (!thread_mod_inited)
      return NULL;

diff --cc src/xbt_modinter.h
index 0936869,988f5f4..0d04e83
--- 1/src/xbt_modinter.h
--- 2/src/xbt_modinter.h
+++ b/src/xbt_modinter.h
@@@ -13,23 -13,23 +13,23 @@@
  SG_BEGIN_DECL()
  
  /* Modules definitions */
 -void xbt_backtrace_preinit(void);
 -void xbt_backtrace_postexit(void);
 +void xbt_backtrace_preinit();
 +void xbt_backtrace_postexit();
  
- void xbt_log_preinit();
+ void xbt_log_preinit(void);
  void xbt_log_init(int *argc, char **argv);
- void xbt_log_postexit();
+ void xbt_log_postexit(void);
  
- void xbt_fifo_preinit();
- void xbt_fifo_postexit();
- void xbt_dict_preinit();
- void xbt_dict_postexit();
+ void xbt_fifo_preinit(void);
+ void xbt_fifo_postexit(void);
+ void xbt_dict_preinit(void);
+ void xbt_dict_postexit(void);
  
- void xbt_os_thread_mod_preinit();
- void xbt_os_thread_mod_postexit();
+ void xbt_os_thread_mod_preinit(void);
+ void xbt_os_thread_mod_postexit(void);
  
 -void *mmalloc_preinit(void);
 -void mmalloc_postexit(void);
 +void *mmalloc_preinit();
 +void mmalloc_postexit();
  
  extern int smx_cleaned;
  extern int xbt_initialized;