fix memory.h include; was pulling in the system memory.h, leaving xmalloc

undefined and implictly returning an int rather than a void*.

19 files changed, 19 insertions, 19 deletions

diff --git a/cvt/alist.c b/cvt/alist.c
index db5cc80..f6e8348 100644
--- a/cvt/alist.c
+++ b/cvt/alist.c
@@ -34,7 +34,7 @@
 #include "libctf/ctf_impl.h"
 
 #include "alist.h"
-#include "memory.h"
+#include "common/memory.h"
 #include "hash.h"
 
 #define	ALIST_HASH_SIZE	997
diff --git a/cvt/ctf.c b/cvt/ctf.c
index c81b98e..6fe959b 100644
--- a/cvt/ctf.c
+++ b/cvt/ctf.c
@@ -30,7 +30,7 @@
 #include "libctf/ctf_impl.h"
 #include "ctftools.h"
 #include "strtab.h"
-#include "memory.h"
+#include "common/memory.h"
 
 /*
  * Name of the file currently being read, used to print error messages.  We
diff --git a/cvt/ctfconvert.c b/cvt/ctfconvert.c
index 4f0b785..fcec295 100644
--- a/cvt/ctfconvert.c
+++ b/cvt/ctfconvert.c
@@ -32,7 +32,7 @@
 
 #include "libctf/ctf_impl.h"
 #include "ctftools.h"
-#include "memory.h"
+#include "common/memory.h"
 
 const  char *progname;
 int debug_level = DEBUG_LEVEL;
diff --git a/cvt/ctfmerge.c b/cvt/ctfmerge.c
index f9d7237..026dd96 100644
--- a/cvt/ctfmerge.c
+++ b/cvt/ctfmerge.c
@@ -184,7 +184,7 @@
 #include "ctftools.h"
 #include "ctfmerge.h"
 #include "traverse.h"
-#include "memory.h"
+#include "common/memory.h"
 #include "fifo.h"
 #include "barrier.h"
 
diff --git a/cvt/dwarf.c b/cvt/dwarf.c
index 3df3b1a..2e6adf5 100644
--- a/cvt/dwarf.c
+++ b/cvt/dwarf.c
@@ -84,7 +84,7 @@
 
 #include "libctf/ctf_impl.h"
 #include "ctftools.h"
-#include "memory.h"
+#include "common/memory.h"
 #include "common/list.h"
 #include "traverse.h"
 
diff --git a/cvt/fifo.c b/cvt/fifo.c
index fb9a11f..56b8519 100644
--- a/cvt/fifo.c
+++ b/cvt/fifo.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 
 #include "fifo.h"
-#include "memory.h"
+#include "common/memory.h"
 
 typedef struct fifonode {
 	void *fn_data;
diff --git a/cvt/fixup_tdescs.c b/cvt/fixup_tdescs.c
index 55a54f4..d40e569 100644
--- a/cvt/fixup_tdescs.c
+++ b/cvt/fixup_tdescs.c
@@ -33,7 +33,7 @@
 #include "libctf/ctf_impl.h"
 #include "ctftools.h"
 #include "hash.h"
-#include "memory.h"
+#include "common/memory.h"
 
 /*
  * Due to 4432619, the 6.1 compiler will sometimes incorrectly generate pointer
diff --git a/cvt/hash.c b/cvt/hash.c
index 21a2a36..41514b8 100644
--- a/cvt/hash.c
+++ b/cvt/hash.c
@@ -32,7 +32,7 @@
 
 #include "libctf/ctf_impl.h"
 #include "hash.h"
-#include "memory.h"
+#include "common/memory.h"
 #include "common/list.h"
 
 struct hash {
diff --git a/cvt/iidesc.c b/cvt/iidesc.c
index 75f986c..1f2c71e 100644
--- a/cvt/iidesc.c
+++ b/cvt/iidesc.c
@@ -31,7 +31,7 @@
 
 #include "libctf/ctf_impl.h"
 #include "ctftools.h"
-#include "memory.h"
+#include "common/memory.h"
 #include "common/list.h"
 #include "hash.h"
 
diff --git a/cvt/input.c b/cvt/input.c
index 900cf85..4e6a05a 100644
--- a/cvt/input.c
+++ b/cvt/input.c
@@ -31,7 +31,7 @@
 
 #include "libctf/ctf_impl.h"
 #include "ctftools.h"
-#include "memory.h"
+#include "common/memory.h"
 #include "common/symbol.h"
 
 typedef int read_cb_f(tdata_t *, char *, void *);
diff --git a/cvt/merge.c b/cvt/merge.c
index b841fdf..404222d 100644
--- a/cvt/merge.c
+++ b/cvt/merge.c
@@ -116,7 +116,7 @@
 #include "ctftools.h"
 #include "common/list.h"
 #include "alist.h"
-#include "memory.h"
+#include "common/memory.h"
 #include "traverse.h"
 
 typedef struct equiv_data equiv_data_t;
diff --git a/cvt/output.c b/cvt/output.c
index 6546351..b4d9e11 100644
--- a/cvt/output.c
+++ b/cvt/output.c
@@ -33,7 +33,7 @@
 #include "libctf/ctf_impl.h"
 #include "ctftools.h"
 #include "common/list.h"
-#include "memory.h"
+#include "common/memory.h"
 #include "traverse.h"
 #include "common/symbol.h"
 
diff --git a/cvt/st_parse.c b/cvt/st_parse.c
index 602ae23..34109bf 100644
--- a/cvt/st_parse.c
+++ b/cvt/st_parse.c
@@ -31,7 +31,7 @@
 #include <setjmp.h>
 #include "pctf/ctf.h"
 #include "ctftools.h"
-#include "memory.h"
+#include "common/memory.h"
 #include "common/list.h"
 
 #define	HASH(NUM)	((int)(NUM & (BUCKETS - 1)))
diff --git a/cvt/stabs.c b/cvt/stabs.c
index 86a106f..dc5a7fe 100644
--- a/cvt/stabs.c
+++ b/cvt/stabs.c
@@ -34,7 +34,7 @@
 #include "ctftools.h"
 #include "common/list.h"
 #include "stack.h"
-#include "memory.h"
+#include "common/memory.h"
 #include "traverse.h"
 
 char *curhdr;
diff --git a/cvt/stack.c b/cvt/stack.c
index 7c36cd5..e54be7b 100644
--- a/cvt/stack.c
+++ b/cvt/stack.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 
 #include "stack.h"
-#include "memory.h"
+#include "common/memory.h"
 
 #define	STACK_SEEDSIZE	5
 
diff --git a/cvt/strtab.c b/cvt/strtab.c
index 5a8ebc6..b8cf2b4 100644
--- a/cvt/strtab.c
+++ b/cvt/strtab.c
@@ -28,7 +28,7 @@
 
 #include "libctf/ctf_impl.h"
 #include "strtab.h"
-#include "memory.h"
+#include "common/memory.h"
 
 #define	STRTAB_HASHSZ	211		/* use a prime number of hash buckets */
 #define	STRTAB_BUFSZ	(64 * 1024)	/* use 64K data buffers by default */
diff --git a/cvt/tdata.c b/cvt/tdata.c
index 524cf04..6357475 100644
--- a/cvt/tdata.c
+++ b/cvt/tdata.c
@@ -29,7 +29,7 @@
 
 #include "libctf/ctf_impl.h"
 #include "ctftools.h"
-#include "memory.h"
+#include "common/memory.h"
 #include "traverse.h"
 
 /*
diff --git a/cvt/traverse.c b/cvt/traverse.c
index febd0b3..c455cf5 100644
--- a/cvt/traverse.c
+++ b/cvt/traverse.c
@@ -33,7 +33,7 @@
 #include "libctf/ctf_impl.h"
 #include "ctftools.h"
 #include "traverse.h"
-#include "memory.h"
+#include "common/memory.h"
 
 int (*tddescenders[])(tdesc_t *, tdtrav_data_t *);
 tdtrav_cb_f tdnops[];
diff --git a/cvt/util.c b/cvt/util.c
index 1364fbc..3fe88a1 100644
--- a/cvt/util.c
+++ b/cvt/util.c
@@ -31,7 +31,7 @@
 
 #include "libctf/ctf_impl.h"
 #include "ctftools.h"
-#include "memory.h"
+#include "common/memory.h"
 
 static void (*terminate_cleanup)(void) = NULL;