[m-rev.] diff: fix runtime compilation in .mmos grades

[Julien Fischer]

Estimated hours taken: 0.1
Branches: main

runtime/mercury_mm_own_stacks.h
runtime/mercury_mm_own_stacks.c
	Fix problems on 64-bit architectures in .mmos grades.

Julien.

Index: runtime/mercury_mm_own_stacks.c
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_mm_own_stacks.c,v
retrieving revision 1.4
diff -u -r1.4 mercury_mm_own_stacks.c
--- runtime/mercury_mm_own_stacks.c	29 Aug 2005 15:44:28 -0000	1.4
+++ runtime/mercury_mm_own_stacks.c	18 Sep 2005 14:58:29 -0000
@@ -383,8 +383,9 @@
         } else {
             fprintf(fp, ", in main context\n\n");
         }
-        fprintf(fp, "returned answers %d, remaining answers ptr %p\n",
-            consumer->MR_cons_num_returned_answers,
+        fprintf(fp, "returned answers %" MR_INTEGER_LENGTH_MODIFIER "d,",
+            consumer->MR_cons_num_returned_answers);
+        fprintf(fp, " remaining answers ptr %p\n",
             consumer->MR_cons_remaining_answer_list_ptr);
     }
 }
Index: runtime/mercury_mm_own_stacks.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_mm_own_stacks.h,v
retrieving revision 1.3
diff -u -r1.3 mercury_mm_own_stacks.h
--- runtime/mercury_mm_own_stacks.h	3 Jun 2005 07:04:22 -0000	1.3
+++ runtime/mercury_mm_own_stacks.h	18 Sep 2005 14:59:37 -0000
@@ -121,7 +121,8 @@
 extern  MR_ConsumerPtr  MR_table_mmos_setup_consumer(MR_GeneratorPtr generator,
                             MR_ConstString pred_id);
 extern  MR_GeneratorPtr MR_table_mmos_setup_generator(MR_TrieNode trie_node,
-                            int num_input_args, MR_Word genererator_pred,
+                            MR_Integer num_input_args,
+                            MR_Word genererator_pred,
                             MR_ConstString pred_id);
 extern  MR_AnswerBlock  MR_table_mmos_consumer_get_next_answer(
                             MR_ConsumerPtr consumer);

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