[m-rev.] diff: fix Cygwin breakage

Simon Taylor staylr at gmail.com
Thu Dec 14 16:41:34 AEDT 2006


Estimated hours taken: 0.1
Branches: main

runtime/mercury_memory_zones.c:
	Add missing conditional compilation in Peter Wang's last
	change which broke things on Cygwin.

Index: runtime/mercury_memory_zones.c
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_memory_zones.c,v
retrieving revision 1.30
diff -u -r1.30 mercury_memory_zones.c
--- runtime/mercury_memory_zones.c	5 Dec 2006 03:34:20 -0000	1.30
+++ runtime/mercury_memory_zones.c	14 Dec 2006 05:38:58 -0000
@@ -426,6 +426,7 @@
     ** workaround, we never put memory zones on the free list and deallocate
     ** them immediately here.
     */
+  #ifdef MR_CHECK_OVERFLOW_VIA_MPROTECT
     size_t          redsize;
     int             res;
 
@@ -433,6 +434,7 @@
     res = MR_protect_pages((char *) zone->MR_zone_redzone,
         redsize + MR_unit, NORMAL_PROT);
     assert(res == 0);
+  #endif
 
     MR_dealloc_zone_memory(zone->MR_zone_bottom,
         ((char *) zone->MR_zone_top) - ((char *) zone->MR_zone_bottom));
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------



More information about the reviews mailing list