# HG changeset patch
# User Nina Engelhardt <nengel@mailbox.tu-berlin.de>
# Date 1347873541 -7200
# Node ID 3c2345880bbe10f432a12722499be5904211c04c
# Parent  ba7abed0873cdad0ce32b78bcfd661f21b01977e# Parent  4f386058d46c6e3bd2bae42c95137934ca522a4c
merge failed subrepo commit

diff -r ba7abed0873c -r 3c2345880bbe DynArray.c
--- a/DynArray.c	Mon Sep 17 11:07:07 2012 +0200
+++ b/DynArray.c	Mon Sep 17 11:19:01 2012 +0200
@@ -7,7 +7,7 @@
 
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <malloc.h>
 
 #include "DynArray.h"
 
diff -r ba7abed0873c -r 3c2345880bbe DynArray.h
--- a/DynArray.h	Mon Sep 17 11:07:07 2012 +0200
+++ b/DynArray.h	Mon Sep 17 11:19:01 2012 +0200
@@ -12,6 +12,7 @@
 #include "VMS_impl/Services_Offered_by_VMS/Memory_Handling/vmalloc.h"
 
 
+
    //A dynamic array is same as any other array, but add a DynArrayInfo next
    // to it.  Accesses and updates of array indexes are done normally, it's
    // only when add a new element into array that use the extra info.