From 29efcd5be140dc5863c0041188ecfbbce49d4df3 Mon Sep 17 00:00:00 2001
From: nemerle <nemerle5@gmail.com>
Date: Tue, 7 Feb 2017 12:09:58 +0100
Subject: [PATCH] Remove references to malloc.h closes #28

---
 src/control.cpp             | 2 --
 tools/makedsig/makedsig.cpp | 3 +--
 tools/parsehdr/parsehdr.cpp | 7 +++----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/control.cpp b/src/control.cpp
index 27c0e71..125e342 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -12,8 +12,6 @@
 #include <cassert>
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
-
 
 typedef std::list<int> nodeList; /* dfsLast index to the node */
 
diff --git a/tools/makedsig/makedsig.cpp b/tools/makedsig/makedsig.cpp
index b7f39c6..f52dfe4 100644
--- a/tools/makedsig/makedsig.cpp
+++ b/tools/makedsig/makedsig.cpp
@@ -10,7 +10,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <memory.h>
 #include <string.h>
 #include <algorithm>
@@ -22,7 +21,7 @@
 
 void saveFile(FILE *fl, const PerfectHash &p_hash, PatternCollector *coll);		/* Save the info */
 
-int	 numKeys;				/* Number of useful codeview symbols */
+static int	 numKeys;				/* Number of useful codeview symbols */
 
 
 static void printUsage(bool longusage) {
diff --git a/tools/parsehdr/parsehdr.cpp b/tools/parsehdr/parsehdr.cpp
index 7f2f630..688e699 100644
--- a/tools/parsehdr/parsehdr.cpp
+++ b/tools/parsehdr/parsehdr.cpp
@@ -5,14 +5,13 @@
 /* Descended from xansi; thanks Geoff! thanks Glenn! */
 
 #include "parsehdr.h"
-#include <malloc.h> /* For debugging */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <algorithm>
 
-dword userval;
-
+static dword userval;
+namespace {
 /* the IGNORE byte */
 byte slosh;
 byte last_slosh;
@@ -51,7 +50,7 @@ PH_ARG_STRUCT *pArg; /* Pointer to the arguements array */
 int numArg;          /* How many elements saved so far */
 int allocArg;        /* How many elements allocated so far */
 int headArg;         /* Head of the arguements linked list */
-
+}
 // DO Callback
 boolT phDoCB(int id, char *data) {
   /*	return callback(hDCX, id, data, userval);*/