--- trunk/OOPSE/libmdtools/fortranWrappers.cpp	2003/07/17 19:25:51	631
+++ trunk/OOPSE/libmdtools/fortranWrappers.cpp	2003/09/05 21:28:52	747
@@ -1,26 +1,28 @@
 #define __C
+
+#include "config.h"
 #include "fSimulation.h"
 #include <fortranWrappers.hpp>
 
-
 extern "C" {
 
-  void 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(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 wrapsimmod_ ( void (*wrapFunction)( void (*p1) setFortranSimList,
-					   void (*p2) setFortranBoxList,
-					   void (*p3) notifyFortranCutOffList) );
+  void F90_FUNC(wrapsimmod, WRAPSIMMOD) (void (*wrapFunction)(void (*p1) setFortranSimList,
+                                                              void (*p2) setFortranBoxList,
+                                                              void (*p3) notifyFortranCutOffList) 
+                             );
 
 #ifdef IS_MPI
-  void wrapsimparallelmod_( void (*wrapFunction)(void (*p1) setFortranMPIlist ) );
+  void F90_FUNC(wrapsimparallelmod, WRAPSIMPARALLELMOD) (void (*wrapFunction)(void (*p1) setFortranMPIlist) );
 #endif // is_mpi
-
+  
 }
 
 
@@ -47,10 +49,10 @@ void wrapMeFF( ForceFields* thisFF ){
 void wrapMeFF( ForceFields* thisFF ){
   
   currentFF = thisFF;
-  wrapforcefield_( wrapFF );
+  F90_FUNC(wrapforcefield, WRAPFORCEFIELD)( wrapFF );
 }
-  
 
+
 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){
@@ -61,7 +63,7 @@ void wrapFF( void (*p1) makeAtypeList, void (*p2) init
   set_sticky_params = p4;
   set_gb_pair_params = p5;
   newEAMtype = p6;
-
+  
 }
 
 
@@ -71,7 +73,7 @@ void wrapMeSimInfo( SimInfo* thePlug ){
 void wrapMeSimInfo( SimInfo* thePlug ){
   
   currentPlug = thePlug;
-  wrapsimmod_( wrapSimInfo );
+  F90_FUNC(wrapsimmod, WRAPSIMMOD) ( wrapSimInfo );
 }
 
 void wrapSimInfo( void (*p1) setFortranSimList, void (*p2) setFortranBoxList, 
@@ -79,8 +81,8 @@ void wrapSimInfo( void (*p1) setFortranSimList, void (
   
   currentPlug->setInternal( p1, p2, p3 );
 }
-  
 
+
 #ifdef IS_MPI
 
 // wrap the mpiSim functions
@@ -89,7 +91,7 @@ void wrapMeSimParallel( mpiSimulation* thisMPIsim ){
 void wrapMeSimParallel( mpiSimulation* thisMPIsim ){
   
   currentMPIsim = thisMPIsim;
-  wrapsimparallelmod_( wrapSimParallel );
+  F90_FUNC(wrapsimparallelmod, WRAPSIMPARALLELMOD) ( wrapSimParallel );
 }
 
 void wrapSimParallel(void (*p1) setFortranMPIlist ){