changeset 29:3c2345880bbe MC_shared

merge failed subrepo commit
author Nina Engelhardt <nengel@mailbox.tu-berlin.de>
date Mon, 17 Sep 2012 11:19:01 +0200
parents ba7abed0873c 4f386058d46c
children
files DynArray.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line diff
     1.1 --- a/DynArray.c	Mon Sep 17 11:07:07 2012 +0200
     1.2 +++ b/DynArray.c	Mon Sep 17 11:19:01 2012 +0200
     1.3 @@ -7,7 +7,7 @@
     1.4  
     1.5  
     1.6  #include <stdio.h>
     1.7 -#include <stdlib.h>
     1.8 +#include <malloc.h>
     1.9  
    1.10  #include "DynArray.h"
    1.11  
     2.1 --- a/DynArray.h	Mon Sep 17 11:07:07 2012 +0200
     2.2 +++ b/DynArray.h	Mon Sep 17 11:19:01 2012 +0200
     2.3 @@ -12,6 +12,7 @@
     2.4  #include "VMS_impl/Services_Offered_by_VMS/Memory_Handling/vmalloc.h"
     2.5  
     2.6  
     2.7 +
     2.8     //A dynamic array is same as any other array, but add a DynArrayInfo next
     2.9     // to it.  Accesses and updates of array indexes are done normally, it's
    2.10     // only when add a new element into array that use the extra info.