From d49e44594b2628e3a1e3aa7890a6f8ffa3b16d6a Mon Sep 17 00:00:00 2001
From: Stephen Williams <steve@wing.icarus.com>
Date: Mon, 21 Jan 2008 18:04:30 -0800
Subject: [PATCH] Fix reported build errors with gcc 4.3

Add missing includes to cstring et al.
---
 elab_net.cc    | 1 +
 elab_scope.cc  | 1 +
 elab_sig.cc    | 1 +
 emit.cc        | 1 +
 load_module.cc | 2 ++
 net_design.cc  | 1 +
 net_link.cc    | 1 +
 net_scope.cc   | 1 +
 pform.h        | 2 ++
 synth2.cc      | 1 +
 sys_funcs.cc   | 2 ++
 t-dll-expr.cc  | 3 ++-
 t-dll-proc.cc  | 3 ++-
 t-dll.cc       | 3 ++-
 verireal.cc    | 3 ++-
 15 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/elab_net.cc b/elab_net.cc
index 2af2130a7..959a7347d 100644
--- a/elab_net.cc
+++ b/elab_net.cc
@@ -28,6 +28,7 @@
 # include  "compiler.h"
 
 # include  <iostream>
+# include  <cstring>
 
 /*
  * This is a state flag that determines whether an elaborate_net must
diff --git a/elab_scope.cc b/elab_scope.cc
index e6d61de76..e4b538bc8 100644
--- a/elab_scope.cc
+++ b/elab_scope.cc
@@ -24,6 +24,7 @@
 # include  "compiler.h"
 # include  <iostream>
 # include  <stdio.h>
+# include  <cstring>
 
 /*
  * Elaboration happens in two passes, generally. The first scans the
diff --git a/elab_sig.cc b/elab_sig.cc
index bef5bfea8..4f21fbdf3 100644
--- a/elab_sig.cc
+++ b/elab_sig.cc
@@ -23,6 +23,7 @@
 # include "config.h"
 
 # include  <iostream>
+# include  <cstdlib>
 
 # include  "Module.h"
 # include  "PExpr.h"
diff --git a/emit.cc b/emit.cc
index 841eda956..4283533cf 100644
--- a/emit.cc
+++ b/emit.cc
@@ -32,6 +32,7 @@
 # include  "netlist.h"
 # include  <typeinfo>
 # include  <cassert>
+# include  <cstring>
 
 bool NetNode::emit_node(struct target_t*tgt) const
 {
diff --git a/load_module.cc b/load_module.cc
index ea3218c32..13dc8daff 100644
--- a/load_module.cc
+++ b/load_module.cc
@@ -31,6 +31,8 @@
 # include  <dirent.h>
 # include  <ctype.h>
 # include  <assert.h>
+# include  <cstdlib>
+# include  <cstring>
 
 /*
  * The module library items are maps of key names to file name within
diff --git a/net_design.cc b/net_design.cc
index 735da2bb6..d1bebfff8 100644
--- a/net_design.cc
+++ b/net_design.cc
@@ -33,6 +33,7 @@
 # include  "util.h"
 # include  "compiler.h"
 # include  <sstream>
+# include  <cstring>
 
 Design:: Design()
 : errors(0), nodes_(0), procs_(0), lcounter_(0)
diff --git a/net_link.cc b/net_link.cc
index 4c477c5bd..5499d1677 100644
--- a/net_link.cc
+++ b/net_link.cc
@@ -27,6 +27,7 @@
 # include  "netlist.h"
 # include  <sstream>
 # include  <string>
+# include  <cstring>
 # include  <typeinfo>
 #ifdef HAVE_MALLOC_H
 # include  <malloc.h>
diff --git a/net_scope.cc b/net_scope.cc
index 6895a0372..511b64967 100644
--- a/net_scope.cc
+++ b/net_scope.cc
@@ -25,6 +25,7 @@
 
 # include  "netlist.h"
 # include  <sstream>
+# include  <cstring>
 
 /*
  * The NetScope class keeps a scope tree organized. Each node of the
diff --git a/pform.h b/pform.h
index 53e4d874b..29b934507 100644
--- a/pform.h
+++ b/pform.h
@@ -37,6 +37,8 @@
 # include  <string>
 # include  <list>
 # include  <stdio.h>
+# include  <cstring>
+# include  <cstdlib>
 
 /*
  * These classes implement the parsed form (P-form for short) of the
diff --git a/synth2.cc b/synth2.cc
index 77661e646..50211a8fe 100644
--- a/synth2.cc
+++ b/synth2.cc
@@ -28,6 +28,7 @@
 #include <cassert>
 #include "NetLatch.h"
 #include <climits>
+#include <cstdlib>
 
 #include <new> // standard operator new
 using std::bad_alloc;
diff --git a/sys_funcs.cc b/sys_funcs.cc
index 0cddcb9a7..c4a80e8f4 100644
--- a/sys_funcs.cc
+++ b/sys_funcs.cc
@@ -23,6 +23,8 @@
 # include  "config.h"
 # include  "compiler.h"
 # include  <stdio.h>
+# include  <cstdlib>
+# include  <cstring>
 
 /*
  * Manage the information about system functions. This information is
diff --git a/t-dll-expr.cc b/t-dll-expr.cc
index a788996d0..d9af89bb0 100644
--- a/t-dll-expr.cc
+++ b/t-dll-expr.cc
@@ -30,7 +30,8 @@
 #ifdef HAVE_MALLOC_H
 # include  <malloc.h>
 #endif
-# include  <stdlib.h>
+# include  <cstdlib>
+# include  <cstring>
 
 /*
  * This is a little convenience function for converting a NetExpr
diff --git a/t-dll-proc.cc b/t-dll-proc.cc
index 6651f39f9..4170ebdf5 100644
--- a/t-dll-proc.cc
+++ b/t-dll-proc.cc
@@ -32,7 +32,8 @@
 #ifdef HAVE_MALLOC_H
 # include  <malloc.h>
 #endif
-# include  <stdlib.h>
+# include  <cstdlib>
+# include  <cstring>
 
 
 bool dll_target::process(const NetProcTop*net)
diff --git a/t-dll.cc b/t-dll.cc
index 0645a515b..21d654296 100644
--- a/t-dll.cc
+++ b/t-dll.cc
@@ -31,7 +31,8 @@
 #ifdef HAVE_MALLOC_H
 # include  <malloc.h>
 #endif
-# include  <stdlib.h>
+# include  <cstdlib>
+# include  <cstring>
 
 #include <new> // standard operator new
 using std::bad_alloc;
diff --git a/verireal.cc b/verireal.cc
index 0f9ffb83e..f7ab6ff16 100644
--- a/verireal.cc
+++ b/verireal.cc
@@ -24,7 +24,8 @@
 
 # include  "verireal.h"
 # include  "verinum.h"
-# include  <stdlib.h>
+# include  <cstdlib>
+# include  <cstring>
 # include  <ctype.h>
 # include  <iostream>
 # include  <math.h>