Index: /branches/eam_branches/ipp-20150616/Ohana/src/libohana/include/ohana_allocate.h
===================================================================
--- /branches/eam_branches/ipp-20150616/Ohana/src/libohana/include/ohana_allocate.h	(revision 38503)
+++ /branches/eam_branches/ipp-20150616/Ohana/src/libohana/include/ohana_allocate.h	(revision 38504)
@@ -1,4 +1,19 @@
 # ifndef OHANA_ALLOCATE
 # define OHANA_ALLOCATE
+
+# define OHANA_MEMMAGIC (uint32_t) 0xdeadbeef
+
+typedef struct OhanaMemblock {
+  uint32_t startblock;	      // endpost marker
+  struct OhanaMemblock *prevBlock; // previously allocated memory
+  struct OhanaMemblock *nextBlock; // next allocated memory
+  size_t size;		      // size of memory
+  const char *file;	      // file (re)allocated 
+  const char *func;	      // func (re)allocated 
+  int line;		      // line (re)allocated
+  int freed;		      // memory has been freed
+  int dummy;		      // need to put endblock on the endpost
+  uint32_t endblock;	      // endpost marker
+} OhanaMemblock;
 
 typedef struct {
Index: /branches/eam_branches/ipp-20150616/Ohana/src/libohana/src/ohana_allocate.c
===================================================================
--- /branches/eam_branches/ipp-20150616/Ohana/src/libohana/src/ohana_allocate.c	(revision 38503)
+++ /branches/eam_branches/ipp-20150616/Ohana/src/libohana/src/ohana_allocate.c	(revision 38504)
@@ -6,6 +6,6 @@
 # include <string.h>
 
-# define TEST_SAVE_FREE_BLOCKS 1
-# define TEST_SAVE_DROP_BLOCKS 1
+# define TEST_SAVE_FREE_BLOCKS 0
+# define TEST_SAVE_DROP_BLOCKS 0
 
 # undef OHANA_MEMORY
@@ -17,27 +17,12 @@
 # define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
 
-# define OHANA_MEMMAGIC (uint32_t) 0xdeadbeef
-
-typedef struct Memblock {
-  uint32_t startblock;	      // endpost marker
-  struct Memblock *prevBlock; // previously allocated memory
-  struct Memblock *nextBlock; // next allocated memory
-  size_t size;		      // size of memory
-  const char *file;	      // file (re)allocated 
-  const char *func;	      // func (re)allocated 
-  int line;		      // line (re)allocated
-  int freed;		      // memory has been freed
-  int dummy;		      // need to put endblock on the endpost
-  uint32_t endblock;	      // endpost marker
-} Memblock;
-
-static Memblock *lastBlock = NULL;
+static OhanaMemblock *lastBlock = NULL;
 
 # if (TEST_SAVE_FREE_BLOCKS) 
-static Memblock *freeBlock = NULL;
+static OhanaMemblock *freeBlock = NULL;
 # endif
 
 # if (TEST_SAVE_DROP_BLOCKS) 
-static Memblock *dropBlock = NULL;
+static OhanaMemblock *dropBlock = NULL;
 # endif
 
@@ -60,5 +45,5 @@
 
   void *ptr;		      // actual user memory allocated
-  Memblock *new;	      // new memblock created to track the user memory
+  OhanaMemblock *new;	      // new memblock created to track the user memory
   size_t size;		      // total number of bytes requested (not items)
 
@@ -67,5 +52,5 @@
 
   // total size is : memblock + data + endpost
-  new = (Memblock *) malloc (sizeof(Memblock) + size + sizeof(void *)); 
+  new = (OhanaMemblock *) malloc (sizeof(OhanaMemblock) + size + sizeof(void *)); 
   if (new == NULL) ohana_memabort ("failed to allocate memory (%s, %d, %s)\n", file, line, func);
 
@@ -117,6 +102,6 @@
 void *ohana_realloc (const char *file, int line, const char *func, void *in, size_t Nelem, size_t esize) {
 
-  Memblock *old;	      // original memblock associated with user memory
-  Memblock *new;	      // new memblock associated with user memory
+  OhanaMemblock *old;	      // original memblock associated with user memory
+  OhanaMemblock *new;	      // new memblock associated with user memory
   size_t size;
 
@@ -128,5 +113,5 @@
 
   // memblock of supplied pointer
-  old = (Memblock *) in - 1;
+  old = (OhanaMemblock *) in - 1;
 
   if (old->startblock != OHANA_MEMMAGIC) ohana_memabort ("corrupt memory (%s, %d, %s)\n", file, line, func);
@@ -143,6 +128,6 @@
   pthread_mutex_lock(&memBlockListMutex);
 
-  Memblock *nextBlock = old->nextBlock;
-  Memblock *prevBlock = old->prevBlock;
+  OhanaMemblock *nextBlock = old->nextBlock;
+  OhanaMemblock *prevBlock = old->prevBlock;
 
   int isLast = (old == lastBlock);
@@ -153,5 +138,5 @@
   // XXX for a test, we are going to always alloc a new block, copy the old data to the new block
   // poison the old block, then free it
-  new = (Memblock *) malloc (sizeof(Memblock) + size + sizeof(void *));
+  new = (OhanaMemblock *) malloc (sizeof(OhanaMemblock) + size + sizeof(void *));
   if (new == NULL) ohana_memabort ("failed to reallocate memory (%s, %d, %s)\n", file, line, func);
   void *ptr_new = (char *) (new + 1);
@@ -165,5 +150,5 @@
   // ask for new memory
   // total size is : memblock + data + endpost
-  new = (Memblock *) realloc (old, sizeof(Memblock) + size + sizeof(void *));
+  new = (OhanaMemblock *) realloc (old, sizeof(OhanaMemblock) + size + sizeof(void *));
   if (new == NULL) ohana_memabort ("failed to reallocate memory (%s, %d, %s)\n", file, line, func);
   void *ptr_new = (char *) (new + 1);
@@ -223,5 +208,5 @@
 void ohana_free (const char *file, int line, const char *func, void *in) {
 
-  Memblock *ref;
+  OhanaMemblock *ref;
 
   if (!in) return;
@@ -229,5 +214,5 @@
   // fprintf (stderr, "free %zx\n", (size_t) in);
 
-  ref = (Memblock *) in - 1;
+  ref = (OhanaMemblock *) in - 1;
 
   if (ref->freed) ohana_memabort ("memory already freed (%s, %d, %s [%d bytes])\n", ref->file, ref->line, ref->func, ref->size);
@@ -239,6 +224,6 @@
   pthread_mutex_lock(&memBlockListMutex);
   
-  Memblock *nextBlock = ref->nextBlock;
-  Memblock *prevBlock = ref->prevBlock;
+  OhanaMemblock *nextBlock = ref->nextBlock;
+  OhanaMemblock *prevBlock = ref->prevBlock;
 
   // remove this memBlock from the list
@@ -284,8 +269,7 @@
   if (!lastBlock) {
     fprintf (stderr, "no memory allocated\n");
-    return TRUE;
-  }
-
-  Memblock *thisBlock = lastBlock;
+  }
+
+  OhanaMemblock *thisBlock = lastBlock;
 
   size_t Ngood  = 0;
@@ -435,5 +419,5 @@
   }
 
-  Memblock *thisBlock = lastBlock;
+  OhanaMemblock *thisBlock = lastBlock;
 
   size_t Ntotal = 0;
@@ -483,5 +467,5 @@
   memstats.Nbad = 0;
   
-  Memblock *thisBlock = lastBlock;
+  OhanaMemblock *thisBlock = lastBlock;
 
   while (thisBlock) {