[m-dev.] diff: fix bootstrapping problem with conway's change

Fergus Henderson fjh at cs.mu.OZ.AU
Thu Dec 17 04:51:07 AEDT 1998


Estimated hours taken: 0.25

Fix a bootstrapping problem with the changes to MR_OBTAIN_GLOBAL_C_LOCK()
that Tom Conway recently committed.

runtime/mercury_thread.h:
	Rename the remaining occurrences of MR_{OBTAIN,RELEASE}_GLOBAL_C_LOCK()
	as MR_{OBTAIN,RELEASE}_GLOBAL_LOCK(), and add the new argument. 
	(Tom and I both forgot these additional occurrences in our previous
	changes.)

Index: runtime/mercury_thread.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_thread.h,v
retrieving revision 1.5
diff -u -r1.5 mercury_thread.h
--- mercury_thread.h	1998/12/16 16:35:42	1.5
+++ mercury_thread.h	1998/12/16 17:23:07
@@ -110,9 +110,8 @@
   #define MR_SIGNAL(nothing)		do { } while (0)
   #define MR_WAIT(no, thing)		do { } while (0)
 
-  #define MR_OBTAIN_GLOBAL_C_LOCK()	do { } while (0)
-
-  #define MR_RELEASE_GLOBAL_C_LOCK()	do { } while (0)
+  #define MR_OBTAIN_GLOBAL_LOCK(where)	do { } while (0)
+  #define MR_RELEASE_GLOBAL_LOCK(where)	do { } while (0)
 
 #endif
 

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "Binaries may die
WWW: <http://www.cs.mu.oz.au/~fjh>  |   but source code lives forever"
PGP: finger fjh at 128.250.37.3        |     -- leaked Microsoft memo.



More information about the developers mailing list