Using stdlib.h rather than malloc.h

This is required for FreeBSD, but also preferred for Linux

diff --git a/doc/install-qt3.sh b/doc/install-qt3.sh
index 8110b1c0ac614b01f0a9bced61c691c31c16058c..285f5fc5e0b8c98b01bab988670c19aa92644f45 100755 (executable)
--- a/doc/install-qt3.sh
+++ b/doc/install-qt3.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 echo "SNARK14m Debian/Ubuntu build"
 echo "Kevin Rosenberg <kevin@rosenberg.net>"

diff --git a/src/snark/analyze.c b/src/snark/analyze.c
index de3d247c7c15aab391a4c5f6b6f955fdad3eb7db..ed07ea13a87affe8c6e8507b4b5687e45cf3605e 100644 (file)
--- a/src/snark/analyze.c
+++ b/src/snark/analyze.c
@@ -11,7 +11,7 @@
  */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 #include "experimenter.h"

diff --git a/src/snark/analyze2.c b/src/snark/analyze2.c
index 64b47aec4775183a3eb1002a5e757cfa1ba64138..d5beaeac682434ec0a68be0176cc24de75516cb9 100644 (file)
--- a/src/snark/analyze2.c
+++ b/src/snark/analyze2.c
@@ -10,7 +10,7 @@
  Previously part of SuperSNARK
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 #include <stdio.h>

diff --git a/src/snark/fom_klds.c b/src/snark/fom_klds.c
index 78fd51b292e38928eaf9e832443d44c1a48b2376..f9b6e5845f22fc42bb9eef1d783c6d0ddfdcfb9b 100644 (file)
--- a/src/snark/fom_klds.c
+++ b/src/snark/fom_klds.c
@@ -10,7 +10,7 @@
 
 // Extracts the Kullback-Leibler distance as a fom
 #include <assert.h>
-#include "malloc.h"
+#include <stdlib.h>
 #include "experimenter.h"
 #include "read_eval_recon4.h"
 

diff --git a/src/snark/fom_weighted_squared_distance.c b/src/snark/fom_weighted_squared_distance.c
index 41577aa1d012d454c002f596b5498fa5ccc2dfc0..d9b031aead2bdb27b68ab4a54b658cdaa1722d3d 100644 (file)
--- a/src/snark/fom_weighted_squared_distance.c
+++ b/src/snark/fom_weighted_squared_distance.c
@@ -10,7 +10,7 @@
 
 // Extracts the weighted squared distance as a fom
 #include <assert.h>
-#include "malloc.h"
+#include <stdlib.h>
 #include "experimenter.h"
 #include "read_eval_recon4.h"
 

diff --git a/src/snark/getiters.c b/src/snark/getiters.c
index f3cfd0826d22ab503b6c2699f2c9778e34a052ad..a5ef18e68c9e184eb16f0db3e65dc96e61c3bf3a 100644 (file)
--- a/src/snark/getiters.c
+++ b/src/snark/getiters.c
@@ -12,7 +12,7 @@
 
 #include <string.h>
 #include <strings.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include "experimenter.h"
 #include "errorc.h"

diff --git a/src/snark/hit_ratio.c b/src/snark/hit_ratio.c
index 4525a2be03092a60586be797bb58c43e53285793..cff9550bd8312812856c53676ffc3f79d7c6cf69 100644 (file)
--- a/src/snark/hit_ratio.c
+++ b/src/snark/hit_ratio.c
@@ -10,7 +10,7 @@
  Previously part of SuperSNARK
  */
 
-#include "malloc.h"
+#include <stdlib.h>
 #include "experimenter.h"
 #include "read_eval_phantom1.h"
 #include "read_eval_recon1.h"

diff --git a/src/snark/imagewise_roi.c b/src/snark/imagewise_roi.c
index 2ae3faf884df4af4b9132626f5d7eec9e62bf72d..31e24d581caff47bdc6b475aba27e8edda65a3a8 100644 (file)
--- a/src/snark/imagewise_roi.c
+++ b/src/snark/imagewise_roi.c
@@ -12,7 +12,7 @@
 
 #include <assert.h>
 
-#include "malloc.h"
+#include <stdlib.h>
 #include "experimenter.h"
 #include "read_eval_phantom1.h"
 #include "read_eval_recon1.h"

diff --git a/src/snark/read_eval_phantom1.c b/src/snark/read_eval_phantom1.c
index 2abeaaf7d5931fbf1e9fac87a559f292da37a184..8f721dc1c3feb577653db95cc09b44b66255203a 100644 (file)
--- a/src/snark/read_eval_phantom1.c
+++ b/src/snark/read_eval_phantom1.c
@@ -26,7 +26,7 @@
  for each structure.
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "experimenter.h"
 #include "errorc.h"
 #include "read_eval_phantom1.h"

diff --git a/src/snark/signif1.c b/src/snark/signif1.c
index d44d607fa059d9391eb6e87b06609a86ef03918c..829c683d34dfa9e45845f384b08d984b9c74eeb3 100644 (file)
--- a/src/snark/signif1.c
+++ b/src/snark/signif1.c
@@ -25,7 +25,7 @@
  highden - high clip value for pointwise accuracy calculation.
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <stdio.h>

diff --git a/src/snark/stru_acc.c b/src/snark/stru_acc.c
index bdccf75b0196fe7e27c5bab5a238e5eec601dc26..e65f101f6d7006a91d16050bab2ceef92bb1b0ab 100644 (file)
--- a/src/snark/stru_acc.c
+++ b/src/snark/stru_acc.c
@@ -12,7 +12,7 @@
  Previously part of SuperSNARK
  */
 
-#include "malloc.h"
+#include <stdlib.h>
 #include "experimenter.h"
 #include "stru_acc.h"
 #include "read_eval_recon1.h"