-void mpi_errhandler_free_ (void* errhandler, int* ierr) {
- *ierr = MPI_Errhandler_free(static_cast<MPI_Errhandler*>(errhandler));
+void mpi_errhandler_free_ (int* errhandler, int* ierr) {
+ MPI_Errhandler tmp = simgrid::smpi::Errhandler::f2c(*errhandler);
+ *ierr = MPI_Errhandler_free(&tmp);
+ if(*ierr == MPI_SUCCESS) {
+ simgrid::smpi::F2C::free_f(*errhandler);
+ }