1.1 --- a/vmalloc.c	Fri Feb 03 19:04:12 2012 +0100
     1.2 +++ b/vmalloc.c	Mon Feb 13 19:35:32 2012 +0100
     1.3 @@ -15,7 +15,7 @@
     1.4  #include <math.h>
     1.5  
     1.6  #include "VMS.h"
     1.7 -#include "Histogram/Histogram.h"
     1.8 +#include "C_Libraries/Histogram/Histogram.h"
     1.9  
    1.10  #define MAX_UINT64 0xFFFFFFFFFFFFFFFF
    1.11  
    1.12 @@ -205,7 +205,7 @@
    1.13   * This is sequential code, meant to only be called from the Master, not from
    1.14   * any slave VPs.
    1.15   */
    1.16 -void *VMS__malloc( size_t sizeRequested )
    1.17 +void *VMS_int__malloc( size_t sizeRequested )
    1.18   {     
    1.19     //============================= MEASUREMENT STUFF ========================
    1.20     #ifdef MEAS__TIME_MALLOC
    1.21 @@ -261,7 +261,7 @@
    1.22   * any slave VPs.
    1.23   */
    1.24  void
    1.25 -VMS__free( void *ptrToFree )
    1.26 +VMS_int__free( void *ptrToFree )
    1.27   {
    1.28      
    1.29     //============================= MEASUREMENT STUFF ========================