[m-rev.] diff: fix bug #106
Julien Fischer
juliensf at csse.unimelb.edu.au
Tue Sep 22 02:07:37 AEST 2009
Fix bug #106 - linking Mercury program's against C++ object files
on Mac OS X was resulting in duplicate symbol errors.
runtime/mercury_trace_base.h:
Mark some global variables as extern in order to prevent
confusing the linker.
Julien
Index: runtime/mercury_trace_base.h
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_trace_base.h,v
retrieving revision 1.64
diff -u -r1.64 mercury_trace_base.h
--- runtime/mercury_trace_base.h 25 Nov 2008 07:46:55 -0000 1.64
+++ runtime/mercury_trace_base.h 21 Sep 2009 16:02:05 -0000
@@ -460,8 +460,8 @@
** only when MR_trace_tailrec_have_reused_frames is true.
*/
-MR_bool MR_trace_tailrec_have_reused_frames;
-MR_Unsigned MR_trace_tailrec_num_reused_frames;
+extern MR_bool MR_trace_tailrec_have_reused_frames;
+extern MR_Unsigned MR_trace_tailrec_num_reused_frames;
/*
** The details of I/O tabling are documented in library/table_builtin.m.
--------------------------------------------------------------------------
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