diff: another fix for my linkage mismatch change

Fergus Henderson fjh at cs.mu.OZ.AU
Fri Sep 4 20:08:41 AEST 1998


Another fix to make things work with my change to
ensure that the declarations and definitions for data constants
specify the same linkage (extern or static).

tests/valid/headvar_not_found.m:
tests/valid/subtype_switch.m:
	Add definitions for types which were declared but not defined.

Index: tests/valid/headvar_not_found.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/headvar_not_found.m,v
retrieving revision 1.1
diff -u -r1.1 headvar_not_found.m
--- headvar_not_found.m	1996/07/20 10:55:17	1.1
+++ headvar_not_found.m	1998/09/04 10:05:29
@@ -11,6 +11,10 @@
 
 :- implementation.
 
+% we need dummy definitions of these types
+:- type (mode) ---> mode(int, int).
+:- type module_info ---> module_info(int, int).
+
 :- pred mode_is_input(module_info::in, (mode)::in) is semidet.
 :- external(mode_is_input/2).
 
Index: tests/valid/subtype_switch.m
===================================================================
RCS file: /home/mercury1/repository/tests/valid/subtype_switch.m,v
retrieving revision 1.2
diff -u -r1.2 subtype_switch.m
--- subtype_switch.m	1997/05/20 02:08:50	1.2
+++ subtype_switch.m	1998/09/04 10:04:46
@@ -32,6 +32,13 @@
 
 :- implementation.
 
+:- type widget
+	--->	text(string)
+	;	width(int)
+	;	height(int)
+	;	command(pred(string, io__state, io__state))
+	;	title(string).
+
 :- import_module string, int, require, list.
 
 :- pred stringify_config(tcl_interp, config, string, io__state, io__state).

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.



More information about the developers mailing list