aboutsummaryrefslogtreecommitdiff
path: root/src/include/pugh.h
diff options
context:
space:
mode:
authortradke <tradke@b61c5cb5-eaca-4651-9a7a-d64986f99364>1999-06-14 14:52:29 +0000
committertradke <tradke@b61c5cb5-eaca-4651-9a7a-d64986f99364>1999-06-14 14:52:29 +0000
commit0cf5f846be642dd36438344e6b79e5280e100ab3 (patch)
tree953bce982135407a944c5d6e50f976c26a906c10 /src/include/pugh.h
parent60bb134582fe23db1e1ac1e5c3309f2ad63479a2 (diff)
Disabled redefining of malloc/free if SGI or T3E was defined,
so that I can link cactus with IsoSurfacer on T3E. Those routines aren't there anyway. git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@56 b61c5cb5-eaca-4651-9a7a-d64986f99364
Diffstat (limited to 'src/include/pugh.h')
-rw-r--r--src/include/pugh.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/include/pugh.h b/src/include/pugh.h
index f4d1ef9..3589a4d 100644
--- a/src/include/pugh.h
+++ b/src/include/pugh.h
@@ -42,6 +42,7 @@
#define ERROR_ABORT(xerrcode) cabort(xerrcode);
+#if 0
/* We have our own Cactus memory routines in pughutils.c */
#if defined(SGI) || defined(T3E)
@@ -52,6 +53,7 @@ void *cactus_malloc(size_t);
#define free(x) cactus_free(x)
void cactus_free(void *);
#endif
+#endif /* 0 */
#ifdef MPI
#include "mpi.h"