# HG changeset patch
# User Some Random Person <seanhalle@yahoo.com>
# Date 1331360200 28800
# Node ID 4d9af65ad3df235a22655c6e94fb9598853b678d
# Parent  24800f145c329f5040628f3ec5b4f279154adf7e
removed print-to-file hack that wasn't generic and fixed include paths

diff -r 24800f145c32 -r 4d9af65ad3df Histogram.c
--- a/Histogram.c	Mon Feb 13 12:50:42 2012 -0800
+++ b/Histogram.c	Fri Mar 09 22:16:40 2012 -0800
@@ -8,12 +8,6 @@
 #include <stdio.h>
 #include "Histogram.h"
 
-//External variables for saving of the histogram
-//These have to be defined by to plugins in order to enable VMS to print this 
-//information to the histogram file
-extern char __ProgrammName[];   //Defined in main.c
-extern char __Scheduler[];      //Defined in VPThread_PluginFns.c
-extern char __DataSet[255];
 
 /*This Histogram Abstract Data Type has a number of bins plus a range of
  * values that the bins span, both chosen at creation.
@@ -213,49 +207,6 @@
         return;
     }
 
-/*
- * Write the header of the measurement file.
- */
-//--------------------------
-//Build Environment
-    fprintf(output, "# >> Build Environment <<\n");
-    fprintf(output, "# Hardware Architecture: ");
-#ifdef __x86_64
-    fprintf(output, "x86_64");
-#endif //__x86_64
-#ifdef __i386
-    fprintf(output, "x86");
-#endif //__i386
-    fprintf(output, "\n");
-    fprintf(output, "# GCC VERSION: %d.%d.%d\n",__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__);
-    fprintf(output, "# Build Date: %s %s\n", __DATE__, __TIME__);
-    fprintf(output, "# Number of Cores: %d\n", NUM_CORES);
-//--------------------------
-    
-//--------------------------
-//VMS Plugins
-    fprintf(output, "#\n# >> VMS Plugins <<\n");
-    fprintf(output, "# Language : ");
-#ifdef VPTHREAD
-    fprintf(output, "VPThread");
-#endif
-#ifdef VCILK
-    fprintf(output, "VCilk");
-#endif
-#ifdef SSR
-    fprintf(output, "SSR");
-#endif
-    fprintf(output, "\n");
-    fprintf(output, "# Scheduler: %s\n", __Scheduler);
-
-//--------------------------
-//Application
-    fprintf(output, "#\n# >> Application <<\n");
-    fprintf(output, "# Name: %s\n", __ProgrammName);
-    fprintf(output, "# Data Set:\n%s\n",__DataSet);
-    
-//--------------------------
-//Histogram
     fprintf(output, "#\n# Histogram Name: %s\n", hist->name);
     fprintf(output, "# Expected Values\n");
     fprintf(output, "#\tnum samples: %d | expected value: %3.2f \n",
diff -r 24800f145c32 -r 4d9af65ad3df Histogram.h
--- a/Histogram.h	Mon Feb 13 12:50:42 2012 -0800
+++ b/Histogram.h	Fri Mar 09 22:16:40 2012 -0800
@@ -6,9 +6,8 @@
  * 
  */
 
-#include "../../VMS_Implementations/VMS_impl/VMS.h"
-#include "../../VMS_Implementations/VMS_impl/vmalloc.h"
-#include "../../VMS_Implementations/VMS_impl/vutilities.h"
+#include "VMS_impl/VMS_primitive_data_types.h"
+#include "VMS_impl/vmalloc.h"
 
 #ifndef _HISTOGRAM_H
 #define	_HISTOGRAM_H