[m-rev.] diff: fix "C calls Mercury" sample

Fergus Henderson fjh at cs.mu.OZ.AU
Tue Feb 17 08:45:40 AEDT 2004


Estimated hours taken: 0.1
Branches: main

Get the "C calls Mercury" sample working again.

samples/c_interface/c_calls_mercury/c_main.c:
samples/c_interface/c_calls_mercury/Mmakefile:
	s/mercury_lib.h/mercury_lib.mh/

samples/c_interface/c_calls_mercury/Mmakefile:
	Delete most of the mentions of mercury_lib.h, since they
	are now handled automatically by Mmake.

Workspace: /home/jupiter/fjh/ws-jupiter/mercury
Index: samples/c_interface/c_calls_mercury/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/c_interface/c_calls_mercury/Mmakefile,v
retrieving revision 1.7
diff -u -d -r1.7 Mmakefile
--- samples/c_interface/c_calls_mercury/Mmakefile	21 Dec 2001 06:22:59 -0000	1.7
+++ samples/c_interface/c_calls_mercury/Mmakefile	16 Feb 2004 21:42:58 -0000
@@ -17,10 +17,10 @@
 
 #-----------------------------------------------------------------------------#
 
-c_main.o: mercury_lib.h c_main.h
+c_main.o: mercury_lib.mh c_main.h
 
 # make sure that `mmake clean' removes c_main.o
 clean_local:
-	rm -f c_main.o mercury_lib.h
+	rm -f c_main.o
 
 #-----------------------------------------------------------------------------#
Index: samples/c_interface/c_calls_mercury/c_main.c
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/c_interface/c_calls_mercury/c_main.c,v
retrieving revision 1.5
diff -u -d -r1.5 c_main.c
--- samples/c_interface/c_calls_mercury/c_main.c	6 Feb 2002 09:01:33 -0000	1.5
+++ samples/c_interface/c_calls_mercury/c_main.c	16 Feb 2004 21:43:25 -0000
@@ -1,4 +1,4 @@
-#include "mercury_lib.h"	/* must come first */
+#include "mercury_lib.mh"	/* must come first */
 
 #include <stdio.h>
 

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  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