# HG changeset patch
# User Sean Halle <seanhalle@yahoo.com>
# Date 1374589702 25200
# Node ID 1ea30ca7093c64cb3d84ce8dc13b689a92dc8798
# Parent  8c0dcf6e15e6f432ec0db585b53289649bb1bc07
changed headers

diff -r 8c0dcf6e15e6 -r 1ea30ca7093c BlockingQueue.c
--- a/BlockingQueue.c	Mon Jul 22 07:05:57 2013 -0700
+++ b/BlockingQueue.c	Tue Jul 23 07:28:22 2013 -0700
@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "BlockingQueue.h"
+#include "PR__common_includes/Services_offered_by_PR/Memory_Handling/vmalloc__wrapper_library.h"
 
 #define INC(x) (++x == 1024) ? (x) = 0 : (x)
 
@@ -173,7 +174,7 @@
 void
 freeSRSWQ( SRSWQueueStruc* Q )
  {
-   PR_int__free( Q );
+   PR__free( Q );
  }
 
 void* readSRSWQ( SRSWQueueStruc* Q )
@@ -333,7 +334,7 @@
       for( i = 0; i < oldSz; i++ )
        { Q->internalQs[i] = oldArray[i];
        }
-      PR_int__free( oldArray );
+      PR__free( oldArray );
     }
    Q->internalQs[ Q->numInternalQs - 1 ] = makeSRSWQ();
    return Q->numInternalQs - 1;
diff -r 8c0dcf6e15e6 -r 1ea30ca7093c BlockingQueue.h
--- a/BlockingQueue.h	Mon Jul 22 07:05:57 2013 -0700
+++ b/BlockingQueue.h	Tue Jul 23 07:28:22 2013 -0700
@@ -8,7 +8,7 @@
 #ifndef  _BLOCKINGQUEUE_H
 #define	_BLOCKINGQUEUE_H
 
-#include "PR__application_includes/PR__application.h"
+#include "PR__common_includes/PR__primitive_data_types.h"
 
 
 #define TRUE  1
diff -r 8c0dcf6e15e6 -r 1ea30ca7093c PrivateQueue.c
--- a/PrivateQueue.c	Mon Jul 22 07:05:57 2013 -0700
+++ b/PrivateQueue.c	Tue Jul 23 07:28:22 2013 -0700
@@ -14,6 +14,7 @@
 #include <stdlib.h>
 
 #include "PrivateQueue.h"
+#include "PR__common_includes/Services_offered_by_PR/Memory_Handling/vmalloc__wrapper_library.h"
 
 
 
@@ -27,10 +28,10 @@
  {
    PrivQueueStruc* retQ;
       //This malloc is not safe to use in wrapper lib nor app code!
-   retQ = (PrivQueueStruc *) PR_int__malloc( sizeof( PrivQueueStruc ) );
+   retQ = (PrivQueueStruc *) PR__malloc( sizeof( PrivQueueStruc ) );
 
       //This malloc is not safe to use in wrapper lib nor app code!
-   retQ->startOfData = PR_int__malloc( 1024 * sizeof(void *) );
+   retQ->startOfData = PR__malloc( 1024 * sizeof(void *) );
    memset( retQ->startOfData, 0, 1024 * sizeof(void *) );
    retQ->extractPos = &(retQ->startOfData[0]); //side by side == empty
    retQ->insertPos  = &(retQ->startOfData[1]); // so start pos's have to be
@@ -64,7 +65,7 @@
    newSize            = 2 * oldSize;
    
       //This malloc is not safe to use in wrapper lib nor app code!
-   Q->startOfData     = (void **)PR_int__malloc( newSize );
+   Q->startOfData     = (void **)PR__malloc( newSize );
    newStartOfData     = (int8 *)Q->startOfData;
    newEndOfData       = newStartOfData + newSize; //all calcs in Bytes
    Q->endOfData       = (void **)newEndOfData;
@@ -102,7 +103,7 @@
       Q->insertPos  = (void **)(newStartOfData + bottPartSize);
     }
       //This free is not safe to use in wrapper lib nor app code!
-   PR_int__free(oldStartOfData);    
+   PR__free(oldStartOfData);    
  }
 
 
@@ -292,6 +293,6 @@
 freePrivQ( PrivQueueStruc *Q )
  {
      //This free is not safe to use in wrapper lib nor app code!
-   PR_int__free( Q->startOfData );
-   PR_int__free( Q );
+   PR__free( Q->startOfData );
+   PR__free( Q );
  }
diff -r 8c0dcf6e15e6 -r 1ea30ca7093c PrivateQueue.h
--- a/PrivateQueue.h	Mon Jul 22 07:05:57 2013 -0700
+++ b/PrivateQueue.h	Tue Jul 23 07:28:22 2013 -0700
@@ -8,9 +8,7 @@
 #ifndef _PRIVATE_QUEUE_H
 #define	_PRIVATE_QUEUE_H
 
-
-#include "PR__application_includes/PR__application.h"
-
+#include "PR__common_includes/PR__primitive_data_types.h"
 
 #define TRUE     1
 #define FALSE    0
diff -r 8c0dcf6e15e6 -r 1ea30ca7093c __brch__PR_univ
--- a/__brch__PR_univ	Mon Jul 22 07:05:57 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-This branch is for the project structure defined Jan 2012..  the #includes reflect this directory structure.
-
-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.
-
diff -r 8c0dcf6e15e6 -r 1ea30ca7093c __brch__Univ_dev
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/__brch__Univ_dev	Tue Jul 23 07:28:22 2013 -0700
@@ -0,0 +1,4 @@
+This branch is for the project structure defined Jan 2012..  the #includes reflect this directory structure.
+
+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.
+