diff options
| author | schnetter <schnetter@51d2df92-0e4f-0410-a727-bd43d766d6b6> | 2004-05-22 14:06:17 +0000 |
|---|---|---|
| committer | schnetter <schnetter@51d2df92-0e4f-0410-a727-bd43d766d6b6> | 2004-05-22 14:06:17 +0000 |
| commit | 83035a1c09d352eb92be8232dc146cdeab98a157 (patch) | |
| tree | 701a13436b41c686c43d3fccd11300a411ff45b2 | |
| parent | 04df42c506fd6b0ac92315c46a40ee45e914d853 (diff) | |
Rename module cctk_Malloc to prevent name clash
git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/Fortran/trunk@11 51d2df92-0e4f-0410-a727-bd43d766d6b6
| -rw-r--r-- | src/cctk.F90 | 2 | ||||
| -rw-r--r-- | src/cctk_Malloc1.F90 (renamed from src/cctk_Malloc.F90) | 4 | ||||
| -rw-r--r-- | src/make.code.defn | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/cctk.F90 b/src/cctk.F90 index 396650e..6e86dc9 100644 --- a/src/cctk.F90 +++ b/src/cctk.F90 @@ -33,7 +33,7 @@ module cctk use cctk_IOMethods use cctk_Interp use cctk_Main - use cctk_Malloc + use cctk_Malloc1 use cctk_MemAlloc use cctk_Misc implicit none diff --git a/src/cctk_Malloc.F90 b/src/cctk_Malloc1.F90 index 55d2775..002668f 100644 --- a/src/cctk_Malloc.F90 +++ b/src/cctk_Malloc1.F90 @@ -11,7 +11,7 @@ #include "cctk.h" -module cctk_Malloc +module cctk_Malloc1 implicit none interface @@ -44,4 +44,4 @@ module cctk_Malloc end interface -end module cctk_Malloc +end module cctk_Malloc1 diff --git a/src/make.code.defn b/src/make.code.defn index 4c12721..59e5590 100644 --- a/src/make.code.defn +++ b/src/make.code.defn @@ -26,7 +26,7 @@ SRCS = cctk.F90 \ cctk_IOMethods.F90 \ cctk_Interp.F90 \ cctk_Main.F90 \ - cctk_Malloc.F90 \ + cctk_Malloc1.F90 \ cctk_MemAlloc.F90 \ cctk_Misc.F90 \ util_Table.F90 |