1.1 --- a/Histogram.c	Mon Feb 13 12:50:42 2012 -0800
     1.2 +++ b/Histogram.c	Fri Mar 09 22:16:40 2012 -0800
     1.3 @@ -8,12 +8,6 @@
     1.4  #include <stdio.h>
     1.5  #include "Histogram.h"
     1.6  
     1.7 -//External variables for saving of the histogram
     1.8 -//These have to be defined by to plugins in order to enable VMS to print this 
     1.9 -//information to the histogram file
    1.10 -extern char __ProgrammName[];   //Defined in main.c
    1.11 -extern char __Scheduler[];      //Defined in VPThread_PluginFns.c
    1.12 -extern char __DataSet[255];
    1.13  
    1.14  /*This Histogram Abstract Data Type has a number of bins plus a range of
    1.15   * values that the bins span, both chosen at creation.
    1.16 @@ -213,49 +207,6 @@
    1.17          return;
    1.18      }
    1.19  
    1.20 -/*
    1.21 - * Write the header of the measurement file.
    1.22 - */
    1.23 -//--------------------------
    1.24 -//Build Environment
    1.25 -    fprintf(output, "# >> Build Environment <<\n");
    1.26 -    fprintf(output, "# Hardware Architecture: ");
    1.27 -#ifdef __x86_64
    1.28 -    fprintf(output, "x86_64");
    1.29 -#endif //__x86_64
    1.30 -#ifdef __i386
    1.31 -    fprintf(output, "x86");
    1.32 -#endif //__i386
    1.33 -    fprintf(output, "\n");
    1.34 -    fprintf(output, "# GCC VERSION: %d.%d.%d\n",__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__);
    1.35 -    fprintf(output, "# Build Date: %s %s\n", __DATE__, __TIME__);
    1.36 -    fprintf(output, "# Number of Cores: %d\n", NUM_CORES);
    1.37 -//--------------------------
    1.38 -    
    1.39 -//--------------------------
    1.40 -//VMS Plugins
    1.41 -    fprintf(output, "#\n# >> VMS Plugins <<\n");
    1.42 -    fprintf(output, "# Language : ");
    1.43 -#ifdef VPTHREAD
    1.44 -    fprintf(output, "VPThread");
    1.45 -#endif
    1.46 -#ifdef VCILK
    1.47 -    fprintf(output, "VCilk");
    1.48 -#endif
    1.49 -#ifdef SSR
    1.50 -    fprintf(output, "SSR");
    1.51 -#endif
    1.52 -    fprintf(output, "\n");
    1.53 -    fprintf(output, "# Scheduler: %s\n", __Scheduler);
    1.54 -
    1.55 -//--------------------------
    1.56 -//Application
    1.57 -    fprintf(output, "#\n# >> Application <<\n");
    1.58 -    fprintf(output, "# Name: %s\n", __ProgrammName);
    1.59 -    fprintf(output, "# Data Set:\n%s\n",__DataSet);
    1.60 -    
    1.61 -//--------------------------
    1.62 -//Histogram
    1.63      fprintf(output, "#\n# Histogram Name: %s\n", hist->name);
    1.64      fprintf(output, "# Expected Values\n");
    1.65      fprintf(output, "#\tnum samples: %d | expected value: %3.2f \n",

     2.1 --- a/Histogram.h	Mon Feb 13 12:50:42 2012 -0800
     2.2 +++ b/Histogram.h	Fri Mar 09 22:16:40 2012 -0800
     2.3 @@ -6,9 +6,8 @@
     2.4   * 
     2.5   */
     2.6  
     2.7 -#include "../../VMS_Implementations/VMS_impl/VMS.h"
     2.8 -#include "../../VMS_Implementations/VMS_impl/vmalloc.h"
     2.9 -#include "../../VMS_Implementations/VMS_impl/vutilities.h"
    2.10 +#include "VMS_impl/VMS_primitive_data_types.h"
    2.11 +#include "VMS_impl/vmalloc.h"
    2.12  
    2.13  #ifndef _HISTOGRAM_H
    2.14  #define	_HISTOGRAM_H