Ahh malloc is defined in stdlib.h. So if I take out the
#include <malloc.h>
and replace this with
#include <stdlib.h>
if its not already included then this now compiles. However it prints out a whole lot of testing stuff and then concludes with:
... ./simple/multiple-add/merge FAILED /usr/bin/time: illegal option -- o usage: time [_lp] command. --- wmerge 2003-05-01 05:22:51.000000000 +0200 +++ - 2011-03-30 08:09:21.000000000 +0200 @@ -1,9 +0,0 @@ -This -is -the -current -version -of -the -file<<<---.|||=== that has changed--->>> - ./simple/multiple-add/wmerge FAILED /usr/bin/time: illegal option -- o usage: time [_lp] command. --- merge 2010-03-24 07:31:12.000000000 +0100 +++ - 2011-03-30 08:09:21.000000000 +0200 @@ -1,9 +0,0 @@ -<<<<<<< -c -||||||| -*** 1,1 **** 1 -a -======= -*** 1,1 **** 1 -b ->>>>>>> ./simple/trivial-conflict/merge FAILED 0 succeeded and 58 failed make: *** [test] Error 1 [bolt:~/downloads/wiggle_0.8]
So it looks like ever single test failed...
