1.1 --- a/BlockingQueue.c	Mon Jul 22 07:05:57 2013 -0700
     1.2 +++ b/BlockingQueue.c	Tue Jul 23 07:28:22 2013 -0700
     1.3 @@ -14,6 +14,7 @@
     1.4  #include <string.h>
     1.5  
     1.6  #include "BlockingQueue.h"
     1.7 +#include "PR__common_includes/Services_offered_by_PR/Memory_Handling/vmalloc__wrapper_library.h"
     1.8  
     1.9  #define INC(x) (++x == 1024) ? (x) = 0 : (x)
    1.10  
    1.11 @@ -173,7 +174,7 @@
    1.12  void
    1.13  freeSRSWQ( SRSWQueueStruc* Q )
    1.14   {
    1.15 -   PR_int__free( Q );
    1.16 +   PR__free( Q );
    1.17   }
    1.18  
    1.19  void* readSRSWQ( SRSWQueueStruc* Q )
    1.20 @@ -333,7 +334,7 @@
    1.21        for( i = 0; i < oldSz; i++ )
    1.22         { Q->internalQs[i] = oldArray[i];
    1.23         }
    1.24 -      PR_int__free( oldArray );
    1.25 +      PR__free( oldArray );
    1.26      }
    1.27     Q->internalQs[ Q->numInternalQs - 1 ] = makeSRSWQ();
    1.28     return Q->numInternalQs - 1;

     2.1 --- a/BlockingQueue.h	Mon Jul 22 07:05:57 2013 -0700
     2.2 +++ b/BlockingQueue.h	Tue Jul 23 07:28:22 2013 -0700
     2.3 @@ -8,7 +8,7 @@
     2.4  #ifndef  _BLOCKINGQUEUE_H
     2.5  #define	_BLOCKINGQUEUE_H
     2.6  
     2.7 -#include "PR__application_includes/PR__application.h"
     2.8 +#include "PR__common_includes/PR__primitive_data_types.h"
     2.9  
    2.10  
    2.11  #define TRUE  1

     3.1 --- a/PrivateQueue.c	Mon Jul 22 07:05:57 2013 -0700
     3.2 +++ b/PrivateQueue.c	Tue Jul 23 07:28:22 2013 -0700
     3.3 @@ -14,6 +14,7 @@
     3.4  #include <stdlib.h>
     3.5  
     3.6  #include "PrivateQueue.h"
     3.7 +#include "PR__common_includes/Services_offered_by_PR/Memory_Handling/vmalloc__wrapper_library.h"
     3.8  
     3.9  
    3.10  
    3.11 @@ -27,10 +28,10 @@
    3.12   {
    3.13     PrivQueueStruc* retQ;
    3.14        //This malloc is not safe to use in wrapper lib nor app code!
    3.15 -   retQ = (PrivQueueStruc *) PR_int__malloc( sizeof( PrivQueueStruc ) );
    3.16 +   retQ = (PrivQueueStruc *) PR__malloc( sizeof( PrivQueueStruc ) );
    3.17  
    3.18        //This malloc is not safe to use in wrapper lib nor app code!
    3.19 -   retQ->startOfData = PR_int__malloc( 1024 * sizeof(void *) );
    3.20 +   retQ->startOfData = PR__malloc( 1024 * sizeof(void *) );
    3.21     memset( retQ->startOfData, 0, 1024 * sizeof(void *) );
    3.22     retQ->extractPos = &(retQ->startOfData[0]); //side by side == empty
    3.23     retQ->insertPos  = &(retQ->startOfData[1]); // so start pos's have to be
    3.24 @@ -64,7 +65,7 @@
    3.25     newSize            = 2 * oldSize;
    3.26     
    3.27        //This malloc is not safe to use in wrapper lib nor app code!
    3.28 -   Q->startOfData     = (void **)PR_int__malloc( newSize );
    3.29 +   Q->startOfData     = (void **)PR__malloc( newSize );
    3.30     newStartOfData     = (int8 *)Q->startOfData;
    3.31     newEndOfData       = newStartOfData + newSize; //all calcs in Bytes
    3.32     Q->endOfData       = (void **)newEndOfData;
    3.33 @@ -102,7 +103,7 @@
    3.34        Q->insertPos  = (void **)(newStartOfData + bottPartSize);
    3.35      }
    3.36        //This free is not safe to use in wrapper lib nor app code!
    3.37 -   PR_int__free(oldStartOfData);    
    3.38 +   PR__free(oldStartOfData);    
    3.39   }
    3.40  
    3.41  
    3.42 @@ -292,6 +293,6 @@
    3.43  freePrivQ( PrivQueueStruc *Q )
    3.44   {
    3.45       //This free is not safe to use in wrapper lib nor app code!
    3.46 -   PR_int__free( Q->startOfData );
    3.47 -   PR_int__free( Q );
    3.48 +   PR__free( Q->startOfData );
    3.49 +   PR__free( Q );
    3.50   }

     4.1 --- a/PrivateQueue.h	Mon Jul 22 07:05:57 2013 -0700
     4.2 +++ b/PrivateQueue.h	Tue Jul 23 07:28:22 2013 -0700
     4.3 @@ -8,9 +8,7 @@
     4.4  #ifndef _PRIVATE_QUEUE_H
     4.5  #define	_PRIVATE_QUEUE_H
     4.6  
     4.7 -
     4.8 -#include "PR__application_includes/PR__application.h"
     4.9 -
    4.10 +#include "PR__common_includes/PR__primitive_data_types.h"
    4.11  
    4.12  #define TRUE     1
    4.13  #define FALSE    0

     5.1 --- a/__brch__PR_univ	Mon Jul 22 07:05:57 2013 -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 PR requires a separat malloc implemeted by PR code..  so this branch has modified the library to use the PR-specific malloc.
     5.7 -

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/__brch__Univ_dev	Tue Jul 23 07:28:22 2013 -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 +