1.1 --- a/BlockingQueue.c	Sat Feb 11 20:37:52 2012 -0800
     1.2 +++ b/BlockingQueue.c	Sun Feb 12 01:43:39 2012 -0800
     1.3 @@ -34,7 +34,7 @@
     1.4  CASQueueStruc* makeCASQ()
     1.5   {
     1.6     CASQueueStruc* retQ;
     1.7 -   retQ = (CASQueueStruc *) VMS__malloc( sizeof( CASQueueStruc ) );
     1.8 +   retQ = (CASQueueStruc *) VMS_int__malloc( sizeof( CASQueueStruc ) );
     1.9  
    1.10     retQ->insertLock = UNLOCKED;
    1.11     retQ->extractLock= UNLOCKED;
    1.12 @@ -159,7 +159,7 @@
    1.13  SRSWQueueStruc* makeSRSWQ()
    1.14   {
    1.15     SRSWQueueStruc* retQ;
    1.16 -   retQ = (SRSWQueueStruc *) VMS__malloc( sizeof( SRSWQueueStruc ) );
    1.17 +   retQ = (SRSWQueueStruc *) VMS_int__malloc( sizeof( SRSWQueueStruc ) );
    1.18     memset( retQ->startOfData, 0, 1024 * sizeof(void *) );
    1.19     
    1.20     retQ->extractPos = &(retQ->startOfData[0]); //side by side == empty
    1.21 @@ -172,7 +172,7 @@
    1.22  void
    1.23  freeSRSWQ( SRSWQueueStruc* Q )
    1.24   {
    1.25 -   VMS__free( Q );
    1.26 +   VMS_int__free( Q );
    1.27   }
    1.28  
    1.29  void* readSRSWQ( SRSWQueueStruc* Q )
    1.30 @@ -298,11 +298,11 @@
    1.31  SRMWQueueStruc* makeSRMWQ()
    1.32   { SRMWQueueStruc* retQ;
    1.33     
    1.34 -   retQ = (SRMWQueueStruc *) VMS__malloc( sizeof( SRMWQueueStruc ) );
    1.35 +   retQ = (SRMWQueueStruc *) VMS_int__malloc( sizeof( SRMWQueueStruc ) );
    1.36     
    1.37     retQ->numInternalQs = 0;
    1.38     retQ->internalQsSz  = 10;
    1.39 -   retQ->internalQs = VMS__malloc( retQ->internalQsSz * sizeof(SRSWQueueStruc *));
    1.40 +   retQ->internalQs = VMS_int__malloc( retQ->internalQsSz * sizeof(SRSWQueueStruc *));
    1.41     
    1.42     retQ->lastQReadFrom = 0;
    1.43     
    1.44 @@ -328,11 +328,11 @@
    1.45        oldSz            = Q->internalQsSz;
    1.46        oldArray         = Q->internalQs;
    1.47        Q->internalQsSz *= 2;
    1.48 -      Q->internalQs    = VMS__malloc( Q->internalQsSz * sizeof(SRSWQueueStruc *));
    1.49 +      Q->internalQs    = VMS_int__malloc( Q->internalQsSz * sizeof(SRSWQueueStruc *));
    1.50        for( i = 0; i < oldSz; i++ )
    1.51         { Q->internalQs[i] = oldArray[i];
    1.52         }
    1.53 -      VMS__free( oldArray );
    1.54 +      VMS_int__free( oldArray );
    1.55      }
    1.56     Q->internalQs[ Q->numInternalQs - 1 ] = makeSRSWQ();
    1.57     return Q->numInternalQs - 1;

     2.1 --- a/PrivateQueue.c	Sat Feb 11 20:37:52 2012 -0800
     2.2 +++ b/PrivateQueue.c	Sun Feb 12 01:43:39 2012 -0800
     2.3 @@ -26,9 +26,9 @@
     2.4  PrivQueueStruc* makePrivQ()
     2.5   {
     2.6     PrivQueueStruc* retQ;
     2.7 -   retQ = (PrivQueueStruc *) VMS__malloc( sizeof( PrivQueueStruc ) );
     2.8 +   retQ = (PrivQueueStruc *) VMS_int__malloc( sizeof( PrivQueueStruc ) );
     2.9  
    2.10 -   retQ->startOfData = VMS__malloc( 1024 * sizeof(void *) );
    2.11 +   retQ->startOfData = VMS_int__malloc( 1024 * sizeof(void *) );
    2.12     memset( retQ->startOfData, 0, 1024 * sizeof(void *) );
    2.13     retQ->extractPos = &(retQ->startOfData[0]); //side by side == empty
    2.14     retQ->insertPos  = &(retQ->startOfData[1]); // so start pos's have to be
    2.15 @@ -46,9 +46,9 @@
    2.16     oldSize           = Q->endOfData - Q->startOfData;
    2.17     newSize           = 2 * oldSize;
    2.18     oldStartOfData = Q->startOfData;
    2.19 -   Q->startOfData = VMS__malloc( newSize * sizeof(void *) );
    2.20 +   Q->startOfData = VMS_int__malloc( newSize * sizeof(void *) );
    2.21     memcpy(Q->startOfData, oldStartOfData, oldSize * sizeof(void *));
    2.22 -   VMS__free(oldStartOfData);
    2.23 +   VMS_int__free(oldStartOfData);
    2.24     
    2.25     Q->extractPos  = &(Q->startOfData[0]); //side by side == empty
    2.26     Q->insertPos   = &(Q->startOfData[1]); // so start pos's have to be