[m-dev.] [reuse] diff: fix gcc problems

[Peter Ross]

Hi,


===================================================================


Estimated hours taken: 1

runtime/mercury.h:
    Don't use __builtin_{set,lng}jmp for versions of gcc less the gcc
    2.8.*.  Note this needs to be tested with a 2.8.*, compiler to see
    if the version needs to be even higher.

runtime/mercury_type_info.h:
    Avoid gcc warning about '/*' contained in comment.


Index: mercury.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury.h,v
retrieving revision 1.19.2.5
diff -u -r1.19.2.5 mercury.h
--- mercury.h	2001/02/20 10:16:16	1.19.2.5
+++ mercury.h	2001/02/27 15:12:23
@@ -303,7 +303,7 @@
 **	2.  The call to __builtin_longjmp() must not be in the same
 **	    function as the call to __builtin_setjmp().
 */
-#ifdef __GNUC__
+#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8))
   #define MR_builtin_setjmp(buf)	__builtin_setjmp((buf))
   #define MR_builtin_longjmp(buf, val)	__builtin_longjmp((buf), (val))
 #else
Index: mercury_type_info.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_type_info.h,v
retrieving revision 1.54.2.4
diff -u -r1.54.2.4 mercury_type_info.h
--- mercury_type_info.h	2001/02/23 16:29:05	1.54.2.4
+++ mercury_type_info.h	2001/02/27 15:12:25
@@ -41,7 +41,7 @@
 **      runtime/mercury_tabling.c
 **      runtime/mercury_type_info.c
 **      library/std_util.m
-**	java/*.java
+**	java/ *.java
 **	    (for updating the Java backend RTTI
 **	    structures)
 **     

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