[m-rev.] diff: fix minor runtime problems

Julien Fischer juliensf at csse.unimelb.edu.au
Sat Jul 16 17:50:55 AEST 2011


Branches: main, 11.07

Fix minor problems in the runtime identified by Visual C.

runtime/mercury_memory_zones.c:
 	Fix a call to a function that no longer exists.

runtime/mercury_stack_trace.h:
 	Fix argument type mismatches between function prototypes
 	and definitions.

Julien.

Index: runtime/mercury_memory_handlers.c
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_memory_handlers.c,v
retrieving revision 1.35
diff -u -r1.35 mercury_memory_handlers.c
--- runtime/mercury_memory_handlers.c	5 Apr 2011 10:27:26 -0000	1.35
+++ runtime/mercury_memory_handlers.c	16 Jul 2011 07:12:51 -0000
@@ -712,7 +712,7 @@
              ** Browse the mercury memory zones to see if the
              ** AV address references one of them.
              */
-            zone = MR_get_used_memory_zones();
+            zone = MR_get_used_memory_zones_readonly();
              while(zone != NULL) {
                  fprintf(stderr,
                          "\n***    Checking zone %s#%"
Index: runtime/mercury_memory_zones.c
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_memory_zones.c,v
retrieving revision 1.40
diff -u -r1.40 mercury_memory_zones.c
--- runtime/mercury_memory_zones.c	13 Jul 2011 00:03:30 -0000	1.40
+++ runtime/mercury_memory_zones.c	16 Jul 2011 07:11:35 -0000
@@ -576,7 +576,7 @@

  MR_MemoryZone *
  MR_create_or_reuse_zone(const char *name, size_t size, size_t offset,
-    size_t redzone_size, MR_ZoneHandler handler)
+    size_t redzone_size, MR_ZoneHandler *handler)
  {
      MR_Word         *base;
      size_t          total_size;
Index: runtime/mercury_stack_trace.h
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_stack_trace.h,v
retrieving revision 1.42
diff -u -r1.42 mercury_stack_trace.h
--- runtime/mercury_stack_trace.h	25 Nov 2008 07:46:54 -0000	1.42
+++ runtime/mercury_stack_trace.h	16 Jul 2011 07:14:38 -0000
@@ -354,7 +354,7 @@

  extern  void        MR_dump_stack_record_print(FILE *fp,
                          MR_bool include_trace_data,
-                        MR_StackDumpInfo dump_info);
+                        const MR_StackDumpInfo dump_info);

  /*
  ** Find the first call event on the stack whose event number or sequence number

--------------------------------------------------------------------------
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