[m-rev.] diff: another MacOS X fix

Fergus Henderson fjh at cs.mu.OZ.AU
Mon Apr 16 19:50:11 AEST 2001


Estimated hours taken: 0.25
Branches: main, release

runtime/mercury_wrapper.c:
	Make the work-around for a Debian Linux problem conditional on
	#ifdef __linux__, since it turns out that the work-around causes
	problems on Mac OS X (Darwin).

Workspace: /home/hg/fjh/ws-hg3/mercury
Index: runtime/mercury_wrapper.c
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_wrapper.c,v
retrieving revision 1.87
diff -c -d -r1.87 mercury_wrapper.c
*** runtime/mercury_wrapper.c	2001/03/28 08:18:11	1.87
--- runtime/mercury_wrapper.c	2001/04/16 09:47:58
***************
*** 276,281 ****
--- 276,282 ----
  	*/
  	MR_save_regs_to_mem(c_regs);
  
+ #ifdef __linux__
  	/*
  	** XXX Ensure that we link in atexit().
  	** XXX This works around a bug in gcc 2.95.3 (prerelease) and/or
***************
*** 285,290 ****
--- 286,292 ----
  	** libraries such as `-lc'.
  	*/
  	MR_global_pointer = (void *) atexit;
+ #endif
  
  #if defined(MR_LOWLEVEL_DEBUG) || defined(MR_TABLE_DEBUG)
  	/*

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------



More information about the reviews mailing list