[m-dev.] trivial diff: label layout field type

[Zoltan Somogyi]

runtime/mercury_stack_layout.h:
	Fix an oversight in the change for adding line numbers, which changed
	the type of one field in label layouts: delete some unnecessary casts
	that assumed the old type for this field, some of which cause warnings.

Zoltan.

cvs diff: Diffing .
Index: mercury_stack_layout.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_stack_layout.h,v
retrieving revision 1.30
diff -u -b -r1.30 mercury_stack_layout.h
--- mercury_stack_layout.h	1999/11/15 00:43:37	1.30
+++ mercury_stack_layout.h	1999/11/15 01:51:34
@@ -268,13 +268,13 @@
 #define	MR_SHORT_COUNT_MASK	((1 << MR_SHORT_COUNT_BITS) - 1)
 
 #define	MR_has_valid_var_count(slvs)					    \
-		(((Integer) ((slvs)->MR_slvs_var_count)) >= 0)
+		(((slvs)->MR_slvs_var_count) >= 0)
 #define	MR_has_valid_var_info(slvs)					    \
-		(((Integer) ((slvs)->MR_slvs_var_count)) > 0)
+		(((slvs)->MR_slvs_var_count) > 0)
 #define	MR_long_desc_var_count(slvs)					    \
-		(((Integer) ((slvs)->MR_slvs_var_count)) >> MR_SHORT_COUNT_BITS)
+		(((slvs)->MR_slvs_var_count) >> MR_SHORT_COUNT_BITS)
 #define	MR_short_desc_var_count(slvs)					    \
-		(((Integer) ((slvs)->MR_slvs_var_count)) & MR_SHORT_COUNT_MASK)
+		(((slvs)->MR_slvs_var_count) & MR_SHORT_COUNT_MASK)
 #define	MR_all_desc_var_count(slvs)					    \
 		(MR_long_desc_var_count(slvs) + MR_short_desc_var_count(slvs))
 
@@ -538,7 +538,7 @@
 	MR_Stack_Layout_Label mercury_data__layout__##label = {		\
 		&mercury_data__layout__##entry,				\
 		{							\
-			(void *) -1,	/* No info about live values */	\
+			-1,		/* No info about live values */	\
 			NULL,						\
 			NULL,						\
 			NULL						\
cvs diff: Diffing GETOPT
cvs diff: Diffing machdeps
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------