--- trunk/OOPSE/libmdtools/fortranWrappers.cpp	2003/10/28 16:03:37	829
+++ trunk/OOPSE/libmdtools/fortranWrappers.cpp	2003/10/28 17:04:06	832
@@ -5,41 +5,47 @@
 #include "fortranWrappers.hpp"
 
 
-
-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 "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) 
+                                                 );
   
-extern void F90_FUNC(wrapsimmod, WRAPSIMMOD) (void (*wrapFunction)(void (*p1) setFortranSimList,
+  void F90_FUNC(wrapsimmod, WRAPSIMMOD) (void (*wrapFunction)(void (*p1) setFortranSimList,
 							      void (*p2) setFortranBoxList,
 							      void (*p3) notifyFortranCutOffList) 
 					 );
   
 #ifdef IS_MPI
-extern void F90_FUNC(wrapsimparallelmod, WRAPSIMPARALLELMOD) (void (*wrapFunction)(void (*p1) setFortranMPIlist) );
+  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);
+}
+
+/*
 void (*makeAtype) makeAtypeList;
 void (*initFortranFF) initFortranFFList;
 void (*set_sticky_params) set_sticky_params_List;
 void (*set_gb_pair_params) set_gb_pair_params_List;
 void (*newEAMtype) newEAMtype_List;
+*/
 
+extern "C" {
 void wrapSimInfo( void (*p1) setFortranSimList, void (*p2) setFortranBoxList, 
 		  void (*p3) notifyFortranCutOffList );
 
 #ifdef IS_MPI
 void wrapSimParallel(void (*p1) setFortranMPIlist );
 #endif // is_mpi
+}
 
-
 // take care of the ForceField functions
 
 ForceFields* currentFF;
@@ -73,9 +79,10 @@ void wrapSimInfo( void (*p1) setFortranSimList, void (
   F90_FUNC(wrapsimmod, WRAPSIMMOD) ( wrapSimInfo );
 }
 
-void wrapSimInfo( void (*p1) setFortranSimList, void (*p2) setFortranBoxList, 
+
+extern "C" void wrapSimInfo( void (*p1) setFortranSimList, void (*p2) setFortranBoxList, 
 		  void (*p3) notifyFortranCutOffList){
-  
+
   currentPlug->setInternal( p1, p2, p3 );
 }