--- trunk/OOPSE/libmdtools/fortranWrappers.cpp 2003/09/05 21:28:52 747 +++ trunk/OOPSE/libmdtools/fortranWrappers.cpp 2003/10/28 16:03:37 829 @@ -2,30 +2,27 @@ #include "config.h" #include "fSimulation.h" -#include +#include "fortranWrappers.hpp" -extern "C" { - void F90_FUNC(wrapforcefield, WRAPFORCEFIELD) (void (*wrapFunction)(void (*p1) makeAtypeList, - void (*p2) initFortranFFList, - void (*p3) doForceLoopList, - void (*p4) set_sticky_params_List, - void (*p5) set_gb_pair_params_List, - void (*p6) newEAMtype_List) - ); - - void F90_FUNC(wrapsimmod, WRAPSIMMOD) (void (*wrapFunction)(void (*p1) setFortranSimList, - void (*p2) setFortranBoxList, - void (*p3) notifyFortranCutOffList) - ); +extern void F90_FUNC(wrapforcefield, WRAPFORCEFIELD) (void (*wrapFunction)(void (*p1) makeAtypeList, + void (*p2) initFortranFFList, + void (*p3) doForceLoopList, + void (*p4) set_sticky_params_List, + void (*p5) set_gb_pair_params_List, + void (*p6) newEAMtype_List) + ); + +extern void F90_FUNC(wrapsimmod, WRAPSIMMOD) (void (*wrapFunction)(void (*p1) setFortranSimList, + void (*p2) setFortranBoxList, + void (*p3) notifyFortranCutOffList) + ); + #ifdef IS_MPI - void F90_FUNC(wrapsimparallelmod, WRAPSIMPARALLELMOD) (void (*wrapFunction)(void (*p1) setFortranMPIlist) ); +extern void F90_FUNC(wrapsimparallelmod, WRAPSIMPARALLELMOD) (void (*wrapFunction)(void (*p1) setFortranMPIlist) ); #endif // is_mpi - -} - void wrapFF( void (*p1) makeAtypeList, void (*p2) initFortranFFList, void (*p3) doForceLoopList, void (*p4) set_sticky_params_List, void (*p5) set_gb_pair_params_List, void (*p6) newEAMtype_List); @@ -101,3 +98,4 @@ void wrapSimParallel(void (*p1) setFortranMPIlist ){ #endif // is_mpi +