diff -ru xapian-core-0.5.4.orig/backends/quartz/quartz_postlist.cc xapian-core-0.5.4/backends/quartz/quartz_postlist.cc
--- xapian-core-0.5.4.orig/backends/quartz/quartz_postlist.cc	Sat Oct 12 17:16:08 2002
+++ xapian-core-0.5.4/backends/quartz/quartz_postlist.cc	Tue Dec  3 04:15:18 2002
@@ -200,7 +200,7 @@
     // Read the docid of the first entry in the posting list.
     if (!unpack_uint(posptr, end, &did))
 	report_read_error(*posptr);
-    DEBUGLINE(DB, "doc_id = " << id);
+    DEBUGLINE(DB, "doc_id = " << did);
     RETURN(did);
 }
 
@@ -926,8 +926,8 @@
 #ifdef MUS_DEBUG
 	om_termcount old_number_of_entries = number_of_entries;
 	om_termcount old_collection_freq = collection_freq;
-	read_start_of_first_chunk(&pos, end,
-				  &number_of_entries, &collection_freq, &did);
+	did = read_start_of_first_chunk(&pos, end,
+				  &number_of_entries, &collection_freq);
 #else
 	did = read_start_of_first_chunk(&pos, end, 0, 0);
 #endif
diff -ru xapian-core-0.5.4.orig/matcher/localmatch.cc xapian-core-0.5.4/matcher/localmatch.cc
--- xapian-core-0.5.4.orig/matcher/localmatch.cc	Tue Oct  8 20:30:01 2002
+++ xapian-core-0.5.4/matcher/localmatch.cc	Tue Dec  3 13:53:26 2002
@@ -469,7 +469,7 @@
 bool
 LocalSubMatch::prepare_match(bool /*nowait*/)
 {
-    DEBUGCALL(MATCH, bool, "LocalSubMatch::prepare_match", nowait);
+    DEBUGCALL(MATCH, bool, "LocalSubMatch::prepare_match", "/*nowait*/");
     if (!is_prepared) {
 	DEBUGLINE(MATCH, "LocalSubMatch::prepare_match() - Gathering my statistics");
 	OmTermIterator terms = users_query.get_terms();
diff -ru xapian-core-0.5.4.orig/matcher/tradweight.cc xapian-core-0.5.4/matcher/tradweight.cc
--- xapian-core-0.5.4.orig/matcher/tradweight.cc	Tue Oct  8 20:30:01 2002
+++ xapian-core-0.5.4/matcher/tradweight.cc	Tue Dec  3 13:16:55 2002
@@ -107,7 +107,7 @@
 om_weight
 TradWeight::get_sumextra(om_doclength /*len*/) const
 {
-    DEBUGCALL(MATCH, om_weight, "TradWeight::get_sumextra", len);
+    DEBUGCALL(MATCH, om_weight, "TradWeight::get_sumextra", "/*len*/");
     RETURN(0);
 }