libc-980531 malloc/malloc.c,mach/Machrules

[UCHIYAMA Yasushi]

In Hurd, mutex_init() expand to

#define	MACRO_BEGIN	do {
#define	MACRO_END	} while (0)
#define	mutex_init(m) \
	MACRO_BEGIN \
	spin_lock_init(&(m)->lock); \
	cthread_queue_init(&(m)->queue); \
	spin_lock_init(&(m)->held); \
	MACRO_END

So (void)mutex_init() is syntax error.


diff -ur libc-980531.orig/mach/Machrules libc-980531/mach/Machrules
--- libc-980531.orig/mach/Machrules	Tue Apr 14 08:52:21 1998
+++ libc-980531/mach/Machrules	Sat Jun  6 19:14:24 1998
@@ -114,7 +114,7 @@
 	       -server /dev/null -user /dev/null -header /dev/null
 	for call in $($*-calls); do \
 	  $(transform-user-stub) \
-	  ../move-if-change $(objpfx)$(transform-user-stub-output)_$${call}.c \
+	  ../scripts/move-if-change $(objpfx)$(transform-user-stub-output)_$${call}.c \
 			    $(objpfx)RPC_$${call}.c; \
 	done
 	touch $@
diff -ur libc-980531.orig/malloc/malloc.c libc-980531/malloc/malloc.c
--- libc-980531.orig/malloc/malloc.c	Tue May 19 16:08:55 1998
+++ libc-980531/malloc/malloc.c	Sat Jun  6 21:11:18 1998
@@ -1604,11 +1604,11 @@
   __free_hook = save_free_hook;
 #endif
   for(ar_ptr = &main_arena;;) {
-    (void)mutex_init(&ar_ptr->mutex);
+    mutex_init(&ar_ptr->mutex);
     ar_ptr = ar_ptr->next;
     if(ar_ptr == &main_arena) break;
   }
-  (void)mutex_init(&list_lock);
+  mutex_init(&list_lock);
 }
 
 #endif
---
UCHIYAMA Yasushi
uch@nop.or.jp