From: ian <ian>
Date: Sat, 4 Feb 2006 14:33:41 +0000 (+0000)
Subject: compilation fixes
X-Git-Tag: debian/1.1.1~76
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=commitdiff_plain;h=2aaa6d9084b8a950151d64b4fe7a483be59b5722;hp=2b24ccf8dc74b52fad1d1a74f29c5d3fe493d68a;ds=sidebyside

compilation fixes
---

diff --git a/Makefile b/Makefile
index d0462d6..9e73776 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-SUBDIRS=	base adns hbytes crypto
+SUBDIRS=	base adns hbytes cdb crypto
 # dgram tuntap
 
 default: all
diff --git a/cdb/cdb.tct b/cdb/cdb.tct
index d113af9..29325f1 100644
--- a/cdb/cdb.tct
+++ b/cdb/cdb.tct
@@ -106,7 +106,8 @@ Table cdbwr Cdbwr_SubCommand
 		db	iddata(&cdbtcl_rwdatabases)
 	compact-check 0
 		db	iddata(&cdbtcl_rwdatabases)
-	compact-auto 0 # this is the default
+	compact-auto 0
+		# this is the default
 		db	iddata(&cdbtcl_rwdatabases)
 	compact-explicit 0
 		db	iddata(&cdbtcl_rwdatabases)
diff --git a/cdb/writeable.c b/cdb/writeable.c
index 0334a45..3c718d8 100644
--- a/cdb/writeable.c
+++ b/cdb/writeable.c
@@ -63,13 +63,16 @@ static HashValue *htv_prep(int len) {
   HashValue *hd;
   hd= TALLOC((hd->data - (Byte*)hd) + len);
   hd->len= len;
+  return hd;
 }  
 static Byte *htv_fillptr(HashValue *hd) {
   return hd->data;
 }
+#if 0
 static void htv_fill(HashValue *hd, const Byte *data) {
   memcpy(hd->data, data, hd->len);
 }
+#endif
 
 static void ht_setup(HashTable *ht) {
   Tcl_InitHashTable(&ht->t, TCL_STRING_KEYS);