Index: /branches/dvo-mods-2007-02/Ohana/src/libohana/include/ohana_allocate.h
===================================================================
--- /branches/dvo-mods-2007-02/Ohana/src/libohana/include/ohana_allocate.h	(revision 12276)
+++ /branches/dvo-mods-2007-02/Ohana/src/libohana/include/ohana_allocate.h	(revision 12277)
@@ -16,13 +16,13 @@
 # define ohana_memdump(X) ohana_memdump_func (X);
 
-# define ALLOCATE(X,T,S) \
-  X = (T *) ohana_malloc (__FILE__, __LINE__, (S), sizeof(T))
-# define REALLOCATE(X,T,S) \
-  X = (T *) ohana_realloc(__FILE__, __LINE__, X, (S), sizeof(T));
-# define CHECK_REALLOCATE(X,T,S,N,D) \
-  if ((N) >= (S)) { S += D; \
-  X = (T *) ohana_realloc(__FILE__, __LINE__, X, (S), sizeof(T)); }
-# define FREE(X) if (X != NULL) { ohana_free (__FILE__, __LINE__, X); }
-# define free(X) ohana_free(__FILE__, __LINE__, X)
+# define ALLOCATE(PTR,TYPE,SIZE) \
+  PTR = (TYPE *) ohana_malloc (__FILE__, __LINE__, (SIZE), sizeof(TYPE))
+# define REALLOCATE(PTR,TYPE,SIZE) \
+  PTR = (TYPE *) ohana_realloc(__FILE__, __LINE__, PTR, (SIZE), sizeof(TYPE));
+# define CHECK_REALLOCATE(PTR,TYPE,SIZE,NCURR,DELTA) \
+  if ((NCURR) >= (SIZE)) { SIZE += DELTA; \
+  PTR = (TYPE *) ohana_realloc(__FILE__, __LINE__, PTR, (SIZE), sizeof(TYPE)); }
+# define FREE(PTR) if (PTR != NULL) { ohana_free (__FILE__, __LINE__, PTR); }
+# define free(PTR) ohana_free(__FILE__, __LINE__, PTR)
 
 # else 
@@ -33,22 +33,22 @@
 
 # ifndef ALLOCATE
-# define ALLOCATE(X,T,S)  \
-  X = (T *) malloc ((unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
-  if (X == NULL) { \
+# define ALLOCATE(PTR,TYPE,SIZE)  \
+  PTR = (TYPE *) malloc ((unsigned)(MAX(((SIZE)*((int)sizeof(TYPE))),1))); \
+  if (PTR == NULL) { \
     fprintf(stderr,"failed malloc at %d in %s\n", __LINE__, __FILE__);\
     exit (10); } 
-# define REALLOCATE(X,T,S) \
-  X = (T *) realloc(X,(unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
-  if (X == NULL) { \
+# define REALLOCATE(PTR,TYPE,SIZE) \
+  PTR = (TYPE *) realloc(PTR,(unsigned)(MAX(((SIZE)*((int)sizeof(TYPE))),1))); \
+  if (PTR == NULL) { \
     fprintf(stderr,"failed realloc at %d in %s\n", __LINE__, __FILE__);\
     exit (10); }
-# define CHECK_REALLOCATE(X,T,S,N,D) \
-  if ((N) >= (S)) { \
-    S += D; \
-    X = (T *) realloc(X,(unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
-    if (X == NULL) { \
+# define CHECK_REALLOCATE(PTR,TYPE,SIZE,NCURR,DELTA) \
+  if ((NCURR) >= (SIZE)) { \
+    SIZE += DELTA; \
+    PTR = (TYPE *) realloc(PTR,(unsigned)(MAX(((SIZE)*((int)sizeof(TYPE))),1))); \
+    if (PTR == NULL) { \
       fprintf(stderr,"failed realloc increment at %d in %s\n", __LINE__, __FILE__);\
       exit (10); } }
-# define FREE(X) if (X != NULL) { free (X); }
+# define FREE(PTR) if (PTR != NULL) { free (PTR); }
 # endif /* ALLOCATE */