Use FTN_NAME for main name, rather than trying to handle all possible
authorOrion Lawlor <olawlor@acm.org>
Wed, 15 May 2002 22:30:14 +0000 (22:30 +0000)
committerOrion Lawlor <olawlor@acm.org>
Wed, 15 May 2002 22:30:14 +0000 (22:30 +0000)
cases right here.

src/langs/f90charm/f90main.C

index 90053c67c4429e2aa0d3424f94f2ef0e4ba4322f..816a60c93c6cbc639f93fb5bf8fa74dd614ae35c 100644 (file)
@@ -1,14 +1,7 @@
 #include "f90main.h"
+#include "charm-api.h"
 
-#if AMPI_FORTRAN
-#if CMK_FORTRAN_USES_ALLCAPS
-extern "C" void F90CHARMMAIN(int, char **);
-#else
-extern "C" void f90charmmain_(int, char **);
-#endif // CMK_FORTRAN_USES_ALLCAPS
-#else
-extern "C" void f90charmmain(int, char **);
-#endif
+extern "C" void FTN_NAME(F90CHARMMAIN,f90charmmain)(int, char **);
 
 extern void _initCharm(int argc, char **argv);
 
@@ -42,15 +35,7 @@ f90main::f90main(CkArgMsg *msg)
   count = 0;
   mainhandle = thishandle;
 
-#if AMPI_FORTRAN
-#if CMK_FORTRAN_USES_ALLCAPS
-  F90CHARMMAIN(argc, argv);
-#else
-  f90charmmain_(argc, argv);
-#endif // CMK_FORTRAN_USES_ALLCAPS
-#else
-  f90charmmain(argc, argv);
-#endif
+  FTN_NAME(F90CHARMMAIN,f90charmmain)(argc, argv);
 
   /*
   int executor_grp = CProxy_executor::ckNew();