# HG changeset patch # User Some Random Person # Date 1337037866 25200 # Node ID ee94893d28432f306a082548d747c03105cbb653 # Parent 40cad2a2fffc1df0a54403c0dd8a9d5a1f0d70c0 fixed includes for refactored VMS dir structure diff -r 40cad2a2fffc -r ee94893d2843 PriorityQueue.c --- a/PriorityQueue.c Fri Mar 02 18:15:20 2012 +0100 +++ b/PriorityQueue.c Mon May 14 16:24:26 2012 -0700 @@ -10,20 +10,11 @@ #include #include "PriorityQueue.h" -#ifndef DEBUG -#include "../../VMS_Implementations/VMS_impl/vmalloc.h" -#endif #define left(i) 2*i #define right(i) 2*i+1 #define parent(i) i/2 -#ifdef DEBUG -#include -#define VMS_WL__malloc malloc -#define VMS_WL__free free -#endif - void swap (PrioQueueStruc *Q, int a, int b) { void *valTmp; int keyTmp; @@ -69,13 +60,13 @@ newSize= 2*oldSize; Q->maxSize= newSize; - newData= VMS_WL__malloc(Q->maxSize*sizeof(heapNode)); + newData= VMS_PI__malloc(Q->maxSize*sizeof(heapNode)); oldData= Q->data; memcpy(newData,oldData,Q->maxSize*sizeof(heapNode)); Q->data= newData; - VMS_WL__free(oldData); + VMS_PI__free(oldData); } diff -r 40cad2a2fffc -r ee94893d2843 PriorityQueue.h --- a/PriorityQueue.h Fri Mar 02 18:15:20 2012 +0100 +++ b/PriorityQueue.h Mon May 14 16:24:26 2012 -0700 @@ -9,8 +9,9 @@ #define _PRIORITY_QUEUE_H #include +#include -#include "../../VMS_Implementations/VMS_impl/VMS_primitive_data_types.h" +#include "VMS_impl/Services_Offered_by_VMS/Memory_Handling/vmalloc.h" typedef struct _PrioQueueStruc PrioQueueStruc; typedef struct _heapNode heapNode;