1.1 --- a/BlockingQueue.c	Wed Jun 06 18:00:59 2012 -0700
     1.2 +++ b/BlockingQueue.c	Mon Sep 03 15:07:45 2012 -0700
     1.3 @@ -35,7 +35,7 @@
     1.4  CASQueueStruc* makeCASQ()
     1.5   {
     1.6     CASQueueStruc* retQ;
     1.7 -   retQ = (CASQueueStruc *) VMS_WL__malloc( sizeof( CASQueueStruc ) );
     1.8 +   retQ = (CASQueueStruc *) PR_WL__malloc( sizeof( CASQueueStruc ) );
     1.9  
    1.10     retQ->insertLock = UNLOCKED;
    1.11     retQ->extractLock= UNLOCKED;
    1.12 @@ -160,7 +160,7 @@
    1.13  SRSWQueueStruc* makeSRSWQ()
    1.14   {
    1.15     SRSWQueueStruc* retQ;
    1.16 -   retQ = (SRSWQueueStruc *) VMS_WL__malloc( sizeof( SRSWQueueStruc ) );
    1.17 +   retQ = (SRSWQueueStruc *) PR_WL__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 @@ -173,7 +173,7 @@
    1.22  void
    1.23  freeSRSWQ( SRSWQueueStruc* Q )
    1.24   {
    1.25 -   VMS_int__free( Q );
    1.26 +   PR_int__free( Q );
    1.27   }
    1.28  
    1.29  void* readSRSWQ( SRSWQueueStruc* Q )
    1.30 @@ -299,11 +299,11 @@
    1.31  SRMWQueueStruc* makeSRMWQ()
    1.32   { SRMWQueueStruc* retQ;
    1.33     
    1.34 -   retQ = (SRMWQueueStruc *) VMS_WL__malloc( sizeof( SRMWQueueStruc ) );
    1.35 +   retQ = (SRMWQueueStruc *) PR_WL__malloc( sizeof( SRMWQueueStruc ) );
    1.36     
    1.37     retQ->numInternalQs = 0;
    1.38     retQ->internalQsSz  = 10;
    1.39 -   retQ->internalQs = VMS_WL__malloc( retQ->internalQsSz * sizeof(SRSWQueueStruc *));
    1.40 +   retQ->internalQs = PR_WL__malloc( retQ->internalQsSz * sizeof(SRSWQueueStruc *));
    1.41     
    1.42     retQ->lastQReadFrom = 0;
    1.43     
    1.44 @@ -329,11 +329,11 @@
    1.45        oldSz            = Q->internalQsSz;
    1.46        oldArray         = Q->internalQs;
    1.47        Q->internalQsSz *= 2;
    1.48 -      Q->internalQs    = VMS_WL__malloc( Q->internalQsSz * sizeof(SRSWQueueStruc *));
    1.49 +      Q->internalQs    = PR_WL__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_int__free( oldArray );
    1.54 +      PR_int__free( oldArray );
    1.55      }
    1.56     Q->internalQs[ Q->numInternalQs - 1 ] = makeSRSWQ();
    1.57     return Q->numInternalQs - 1;

     2.1 --- a/BlockingQueue.h	Wed Jun 06 18:00:59 2012 -0700
     2.2 +++ b/BlockingQueue.h	Mon Sep 03 15:07:45 2012 -0700
     2.3 @@ -8,8 +8,8 @@
     2.4  #ifndef  _BLOCKINGQUEUE_H
     2.5  #define	_BLOCKINGQUEUE_H
     2.6  
     2.7 -#include "VMS_impl/VMS_primitive_data_types.h"
     2.8 -#include "VMS_impl/Services_Offered_by_VMS/Memory_Handling/vmalloc.h"
     2.9 +#include "PR_impl/PR_primitive_data_types.h"
    2.10 +#include "PR_impl/Services_Offered_by_PR/Memory_Handling/vmalloc.h"
    2.11  
    2.12  
    2.13  #define TRUE  1

     3.1 --- a/PrivateQueue.c	Wed Jun 06 18:00:59 2012 -0700
     3.2 +++ b/PrivateQueue.c	Mon Sep 03 15:07:45 2012 -0700
     3.3 @@ -27,10 +27,10 @@
     3.4   {
     3.5     PrivQueueStruc* retQ;
     3.6        //This malloc is not safe to use in wrapper lib nor app code!
     3.7 -   retQ = (PrivQueueStruc *) VMS_int__malloc( sizeof( PrivQueueStruc ) );
     3.8 +   retQ = (PrivQueueStruc *) PR_int__malloc( sizeof( PrivQueueStruc ) );
     3.9  
    3.10        //This malloc is not safe to use in wrapper lib nor app code!
    3.11 -   retQ->startOfData = VMS_int__malloc( 1024 * sizeof(void *) );
    3.12 +   retQ->startOfData = PR_int__malloc( 1024 * sizeof(void *) );
    3.13     memset( retQ->startOfData, 0, 1024 * sizeof(void *) );
    3.14     retQ->extractPos = &(retQ->startOfData[0]); //side by side == empty
    3.15     retQ->insertPos  = &(retQ->startOfData[1]); // so start pos's have to be
    3.16 @@ -61,7 +61,7 @@
    3.17     newSize            = 2 * oldSize;
    3.18     
    3.19        //This malloc is not safe to use in wrapper lib nor app code!
    3.20 -   Q->startOfData     = (void **)VMS_int__malloc( newSize );
    3.21 +   Q->startOfData     = (void **)PR_int__malloc( newSize );
    3.22     newStartOfData     = (int8 *)Q->startOfData;
    3.23     newEndOfData       = newStartOfData + newSize; //all calcs in Bytes
    3.24     Q->endOfData       = (void **)newEndOfData;
    3.25 @@ -99,7 +99,7 @@
    3.26        Q->insertPos  = (void **)(newStartOfData + bottPartSize);
    3.27      }
    3.28        //This free is not safe to use in wrapper lib nor app code!
    3.29 -   VMS_int__free(oldStartOfData);    
    3.30 +   PR_int__free(oldStartOfData);    
    3.31   }
    3.32  
    3.33  
    3.34 @@ -287,6 +287,6 @@
    3.35   freePrivQ( PrivQueueStruc *Q )
    3.36    {
    3.37        //This free is not safe to use in wrapper lib nor app code!
    3.38 -    VMS_int__free( Q->startOfData );
    3.39 -	VMS_int__free( Q );
    3.40 +    PR_int__free( Q->startOfData );
    3.41 +	PR_int__free( Q );
    3.42    }
    3.43 \ No newline at end of file

     4.1 --- a/PrivateQueue.h	Wed Jun 06 18:00:59 2012 -0700
     4.2 +++ b/PrivateQueue.h	Mon Sep 03 15:07:45 2012 -0700
     4.3 @@ -9,8 +9,8 @@
     4.4  #define	_PRIVATE_QUEUE_H
     4.5  
     4.6  
     4.7 -#include "VMS_impl/VMS_primitive_data_types.h"
     4.8 -#include "VMS_impl/Services_Offered_by_VMS/Memory_Handling/vmalloc.h"
     4.9 +#include "PR_impl/PR_primitive_data_types.h"
    4.10 +#include "PR_impl/Services_Offered_by_PR/Memory_Handling/vmalloc.h"
    4.11  
    4.12  
    4.13  #define TRUE     1

     5.1 --- a/__brch__MC_shared	Wed Jun 06 18:00:59 2012 -0700
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,4 +0,0 @@
     5.4 -This branch is for the project structure defined Jan 2012..  the #includes reflect this directory structure.
     5.5 -
     5.6 -More importantly, the MC_shared  version of VMS requires a separat malloc implemeted by VMS code..  so this branch has modified the library to use the VMS-specific malloc.
     5.7 -

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/__brch__Renamed_VMS_to_PR	Mon Sep 03 15:07:45 2012 -0700
     6.3 @@ -0,0 +1,4 @@
     6.4 +This branch is for the project structure defined Jan 2012..  the #includes reflect this directory structure.
     6.5 +
     6.6 +More importantly, the MC_shared  version of PR requires a separat malloc implemeted by PR code..  so this branch has modified the library to use the PR-specific malloc.
     6.7 +