trivial diff: additional fix for linkage mismatch problem

Fergus Henderson fjh at cs.mu.OZ.AU
Fri Sep 4 15:54:35 AEST 1998


Estimated hours taken: 0.25

This change is an addition to my previous change to ensure that the
declarations and definitions for data constants specify the same
linkage (extern or static).

extras/clpr/cfloat.m:
	Add `static' to the hand-coded definitions of the base_type_functors
	and base_type_layouts for the `cfloat' type.

Index: extras/clpr/cfloat.m
===================================================================
RCS file: /home/mercury1/repository/clpr/cfloat.m,v
retrieving revision 1.18
diff -u -r1.18 cfloat.m
--- cfloat.m	1998/07/13 14:34:16	1.18
+++ cfloat.m	1998/09/04 05:51:52
@@ -871,7 +871,7 @@
 
 	/* base_type_functors for `cfloat' */
 
-const struct mercury_data_cfloat__base_type_functors_cfloat_0_struct {
+static const struct mercury_data_cfloat__base_type_functors_cfloat_0_struct {
 	Integer f1;
 } mercury_data_cfloat__base_type_functors_cfloat_0 = {
 	MR_TYPEFUNCTORS_SPECIAL
@@ -879,7 +879,7 @@
 
 	/* base_type_layout for `cfloat' */
 
-const struct mercury_data_cfloat__base_type_layout_cfloat_0_struct {
+static const struct mercury_data_cfloat__base_type_layout_cfloat_0_struct {
 	TYPE_LAYOUT_FIELDS
 } mercury_data_cfloat__base_type_layout_cfloat_0 = {
 	make_typelayout_for_all_tags(TYPELAYOUT_CONST_TAG, 

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