# HG changeset patch
# User Merten Sach <msach@mailbox.tu-berlin.de>
# Date 1329499739 -3600
# Node ID cb888346c3e0112556042fb62e92eeba6c159f74
# Parent  6db9e48989782723abae5587335831590b83c4e2
Changed include paths, but version still does not work because of accidental merge

diff -r 6db9e4898978 -r cb888346c3e0 VMS.h
--- a/VMS.h	Sun Feb 12 01:49:33 2012 -0800
+++ b/VMS.h	Fri Feb 17 18:28:59 2012 +0100
@@ -11,10 +11,10 @@
 #define _GNU_SOURCE
 
 #include "VMS_primitive_data_types.h"
-#include "../../C_Libraries/DynArray/DynArray.h"
-#include "../../C_Libraries/Hash_impl/PrivateHash.h"
-#include "../../C_Libraries/Histogram/Histogram.h"
-#include "../../C_Libraries/Queue_impl/PrivateQueue.h"
+#include "C_Libraries/DynArray/DynArray.h"
+#include "C_Libraries/Hash_impl/PrivateHash.h"
+#include "C_Libraries/Histogram/Histogram.h"
+#include "C_Libraries/Queue_impl/PrivateQueue.h"
 #include "vmalloc.h"
 
 #include <pthread.h>
@@ -27,7 +27,6 @@
 #include "VMS_defs.h"
 
 
-
 //================================ Typedefs =================================
 //
 typedef unsigned long long TSCount;
@@ -50,6 +49,9 @@
 typedef void    VirtProcrFn      ( void *, SlaveVP * ); //initData, animPr
 typedef void  (*ResumeVPFnPtr)   ( SlaveVP *, void * );
 
+//============================= Statistics ==================================
+
+inline TSCount getTSCount();
 
 //============= Request Related ===========
 //
diff -r 6db9e4898978 -r cb888346c3e0 VMS_defs.h
--- a/VMS_defs.h	Sun Feb 12 01:49:33 2012 -0800
+++ b/VMS_defs.h	Fri Feb 17 18:28:59 2012 +0100
@@ -72,11 +72,6 @@
 //#define STATS__USE_TSC_PROBES
 #define STATS__USE_DBL_PROBES
 
-//============================= Statistics ==================================
-
-
-inline TSCount getTSCount();
-
 //==================  Turn Measurement Things on and off ====================
 
 //#define MEAS__TIME_2011_SYS
diff -r 6db9e4898978 -r cb888346c3e0 vmalloc.c
--- a/vmalloc.c	Sun Feb 12 01:49:33 2012 -0800
+++ b/vmalloc.c	Fri Feb 17 18:28:59 2012 +0100
@@ -13,7 +13,7 @@
 #include <stdio.h>
 
 #include "VMS.h"
-#include "../../C_Libraries/Histogram/Histogram.h"
+#include "C_Libraries/Histogram/Histogram.h"
 
 /*Helper function
  *Insert a newly generated free chunk into the first spot on the free list.