From 91224b280579c27962f28cbb7e9bcfafedb627fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Sun, 11 Oct 1998 15:33:11 -0700
Subject: [PATCH] should now compile again...

Rev: src/acconfig.h:1.33
Rev: src/pike_memory.h:1.7
---
 src/acconfig.h    |  4 +++-
 src/pike_memory.h | 31 +------------------------------
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/src/acconfig.h b/src/acconfig.h
index 4d9b565436..eaebaad07d 100644
--- a/src/acconfig.h
+++ b/src/acconfig.h
@@ -1,5 +1,5 @@
 /*
- * $Id: acconfig.h,v 1.32 1998/09/05 15:52:26 grubba Exp $
+ * $Id: acconfig.h,v 1.33 1998/10/11 22:33:11 hubbe Exp $
  */
 #ifndef MACHINE_H
 #define MACHINE_H
@@ -276,10 +276,12 @@
 #ifdef HAVE_ANSI_CONCAT
 #define PIKE_CONCAT(X,Y)	X##Y
 #define PIKE_CONCAT3(X,Y,Z)	X##Y##Z
+#define PIKE_CONCAT4(X,Y,Z,Q)	X##Y##Z##Q
 #else
 #ifdef HAVE_KR_CONCAT
 #define PIKE_CONCAT(X,Y)	X/**/Y
 #define PIKE_CONCAT3(X,Y,Z)	X/**/Y/**/Z
+#define PIKE_CONCAT4(X,Y,Z,Q)	X/**/Y/**/Z/**/Q
 #endif /* HAVE_KR_CONCAT */
 #endif /* HAVE_ANSI_CONCAT */
 
diff --git a/src/pike_memory.h b/src/pike_memory.h
index d21ae367d6..5daedd7346 100644
--- a/src/pike_memory.h
+++ b/src/pike_memory.h
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: pike_memory.h,v 1.6 1998/10/11 11:18:52 hubbe Exp $
+ * $Id: pike_memory.h,v 1.7 1998/10/11 22:33:11 hubbe Exp $
  */
 #ifndef MEMORY_H
 #define MEMORY_H
@@ -93,35 +93,6 @@ void memfill(char *to,
 	     char *from,
 	     INT32 fromlen,
 	     INT32 offset);
-char *debug_xalloc(long size);
-struct fileloc;
-BLOCK_ALLOC(fileloc, 4090)
-struct memloc;
-BLOCK_ALLOC(memloc, 16382)
-struct memhdr;
-char *do_pad(char *mem, long size);
-void check_pad(struct memhdr *mh, int freeok);
-void low_add_marks_to_memhdr(struct memhdr *to,
-			     struct memhdr *from);
-void add_marks_to_memhdr(struct memhdr *to, void *ptr);
-BLOCK_ALLOC(memhdr,16382)
-
-
-
-
-static struct memhdr *find_memhdr(void *p);
-void *debug_malloc(size_t s, const char *fn, int line);
-void *debug_calloc(size_t a, size_t b, const char *fn, int line);
-void *debug_realloc(void *p, size_t s, const char *fn, int line);
-void debug_free(void *p, const char *fn, int line);
-char *debug_strdup(const char *s, const char *fn, int line);
-void dump_memhdr_locations(struct memhdr *from,
-			   struct memhdr *notfrom);
-void debug_malloc_dump_references(void *x);
-void cleanup_memhdrs();
-int main(int argc, char *argv[]);
-void * debug_malloc_update_location(void *p,const char *fn, int line);
-void reset_debug_malloc(void);
 /* Prototypes end here */
 
 #undef BLOCK_ALLOC
-- 
GitLab