New macros for fortran calls

git-svn-id: http://svn.cactuscode.org/flesh/trunk@1637 17b73243-c579-4c4c-a9d2-2d5706c11dac

2 files changed, 8 insertions, 5 deletions

diff --git a/src/IO/FortranBindingsIO.c b/src/IO/FortranBindingsIO.c
index 0f7c877b..1fe6aae7 100644
--- a/src/IO/FortranBindingsIO.c
+++ b/src/IO/FortranBindingsIO.c
@@ -13,12 +13,14 @@
 #include "cctk_IO.h"
 #include "cctk_IOMethods.h"
 
-void FMODIFIER FORTRAN_NAME(CCTK_OutputGH)(int *istat,cGH *GH)
+void CCTK_FCALL CCTK_FNAME(CCTK_OutputGH)
+     (int *istat,cGH *GH)
 {
   *istat = CCTK_OutputGH(GH);
 }
 
-void FMODIFIER FORTRAN_NAME(CCTK_RegisterIOMethod)(int *handle, ONE_FORTSTRING_ARG)
+void CCTK_FCALL CCTK_FNAME(CCTK_RegisterIOMethod)
+     (int *handle, ONE_FORTSTRING_ARG)
 {
   ONE_FORTSTRING_CREATE(name);
   *handle = CCTK_RegisterIOMethod(name);
diff --git a/src/IO/IOMethods.c b/src/IO/IOMethods.c
index 1dc0b891..0192a1ad 100644
--- a/src/IO/IOMethods.c
+++ b/src/IO/IOMethods.c
@@ -498,8 +498,8 @@ int CactusDefaultOutputVarAsByMethod(cGH *GH,
   return 0;
 }
 
-void FMODIFIER FORTRAN_NAME (CCTK_OutputVarAsByMethod)
-                            (int *ierr, cGH *GH, THREE_FORTSTRINGS_ARGS)
+void CCTK_FCALL CCTK_FNAME (CCTK_OutputVarAsByMethod)
+     (int *ierr, cGH *GH, THREE_FORTSTRINGS_ARGS)
 {
   THREE_FORTSTRINGS_CREATE(var, methodname, alias);
 
@@ -673,7 +673,8 @@ int CCTK_OutputVarByMethod(cGH *GH, const char *var, const char *method)
   return 0;
 }
 
-void FMODIFIER FORTRAN_NAME(CCTK_OutputVarByMethod)(int *ierr, cGH *GH, TWO_FORTSTRINGS_ARGS)
+void CCTK_FCALL CCTK_FNAME(CCTK_OutputVarByMethod)
+     (int *ierr, cGH *GH, TWO_FORTSTRINGS_ARGS)
 {
   TWO_FORTSTRINGS_CREATE(var,method);
   *ierr = CCTK_OutputVarByMethod(GH, var, method);