Merge branch 'egil/ansi-pedantic' into maint

5 files changed, 29 insertions, 27 deletions

diff --git a/erts/emulator/beam/big.c b/erts/emulator/beam/big.c
index acfcc845e4..9260c0c4b8 100644
--- a/erts/emulator/beam/big.c
+++ b/erts/emulator/beam/big.c
@@ -150,14 +150,14 @@
 #define D2GTE(a1,a0,b1,b0) (!D2LT(a1,a0,b1,b0))
 #define D2LTE(a1,a0,b1,b0) (!D2GT(a1,a0,b1,b0))
 
-// Add (A+B),  A=(a1B+a0) B=(b1B+b0)
+/* Add (A+B),  A=(a1B+a0) B=(b1B+b0) */
 #define D2ADD(a1,a0,b1,b0,c1,c0) do { \
 	ErtsDigit __ci = 0;	      \
 	DSUM(a0,b0,__ci,c0); \
 	DSUMc(a1,b1,__ci,c1);			\
     } while(0)
 
-// Subtract (A-B), A=(a1B+a0), B=(b1B+b0)  (A>=B)
+/* Subtract (A-B), A=(a1B+a0), B=(b1B+b0)  (A>=B) */
 #define D2SUB(a1,a0,b1,b0,c1,c0) do { \
 	ErtsDigit __bi;		      \
 	DSUB(a0,b0,__bi,c0);	      \
@@ -1337,7 +1337,7 @@ static dsize_t I_lshift(ErtsDigit* x, dsize_t xl, Sint y,
 
 	    while(bw--)
 		*r++ = 0;
-	    if (sw) {  // NOTE! x >> 32 is not = 0!
+	    if (sw) {  /* NOTE! x >> 32 is not = 0! */
 		while(xl--) {
 		    a0 = (*x << sw) | a1;
 		    a1 = (*x >> (D_EXP - sw));
@@ -1384,7 +1384,7 @@ static dsize_t I_lshift(ErtsDigit* x, dsize_t xl, Sint y,
 	    x += (xl-1);
 	    r += (rl-1);
 	    xl -= bw;
-	    if (sw) { // NOTE! x >> 32 is not = 0!
+	    if (sw) { /* NOTE! x >> 32 is not = 0! */
 		while(xl--) {
 		    a1 = (*x >> sw) | a0;
 		    a0 = (*x << (D_EXP-sw));
@@ -2468,7 +2468,7 @@ int term_equals_2pow32(Eterm x)
 	if (!is_big(x))
 	    return 0;
 	bp = big_val(x);
-#if D_EXP == 16   // 16 bit platfrom not really supported!!!
+#if D_EXP == 16   /* 16 bit platfrom not really supported!!! */
 	return (BIG_SIZE(bp) == 3) && !BIG_DIGIT(bp,0) && !BIG_DIGIT(bp,1) && 
 	    BIG_DIGIT(bp,2) == 1;
 #elif D_EXP == 32
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 00247b387a..16b6b1c79d 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -1811,7 +1811,7 @@ erts_set_aux_work_timeout(int ix, erts_aint32_t type, int enable)
 
     ERTS_DBG_CHK_AUX_WORK_VAL(type);
     ERTS_DBG_CHK_AUX_WORK_VAL(erts_atomic32_read_nob(&aux_work_tmo->type[ix]));
-//    erts_fprintf(stderr, "t(%d, 0x%x, %d)\n", ix, type, enable);
+    /* erts_fprintf(stderr, "t(%d, 0x%x, %d)\n", ix, type, enable); */
 
     if (!enable) {
 	old = erts_atomic32_read_band_mb(&aux_work_tmo->type[ix], ~type);
diff --git a/erts/emulator/beam/erl_unicode.c b/erts/emulator/beam/erl_unicode.c
index fa53fd0937..ad6f8b993a 100644
--- a/erts/emulator/beam/erl_unicode.c
+++ b/erts/emulator/beam/erl_unicode.c
@@ -724,7 +724,7 @@ L_Again:   /* Restart with sublist, old listend was pushed on stack */
 			hp = HAlloc(p, 2);
 			obj = CDR(objp);
 			ioterm = CONS(hp, rest_term, obj);
-			//(*left) = 0;
+			/* (*left) = 0; */
 			goto done;
 		    }
 		    if (rest_term != NIL) {
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 8c67f731f4..a9771de7ad 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -5960,7 +5960,7 @@ int driver_outputv(ErlDrvPort ix, char* hbuf, ErlDrvSizeT hlen,
 	    binv++;
 	    n--;
 	} else {
-	    iov->iov_base += skip;
+	    iov->iov_base = ((char *)(iov->iov_base)) + skip;
 	    iov->iov_len -= skip;
 	    skip = 0;
 	}
@@ -6405,7 +6405,7 @@ int driver_enqv(ErlDrvPort ix, ErlIOVec* vec, ErlDrvSizeT skip)
 	    n--;
 	}
 	else {
-	    iov->iov_base += skip;
+	    iov->iov_base = ((char *)(iov->iov_base)) + skip;
 	    iov->iov_len -= skip;
 	    skip = 0;
 	}
@@ -6470,7 +6470,7 @@ int driver_pushqv(ErlDrvPort ix, ErlIOVec* vec, ErlDrvSizeT skip)
 	    n--;
 	}
 	else {
-	    iov->iov_base += skip;
+	    iov->iov_base = ((char *)(iov->iov_base)) + skip;
 	    iov->iov_len -= skip;
 	    skip = 0;
 	}
@@ -6529,7 +6529,7 @@ ErlDrvSizeT driver_deq(ErlDrvPort ix, ErlDrvSizeT size)
 	    q->v_head++;
 	}
 	else {
-	    q->v_head->iov_base += size;
+	    q->v_head->iov_base = ((char *)(q->v_head->iov_base)) + size;
 	    q->v_head->iov_len -= size;
 	    size = 0;
 	}
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index a8f15fdc38..d5d97d748a 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -2713,25 +2713,26 @@ tailrecur_ne:
 	case SMALL_FLOAT:
 	    GET_DOUBLE(bw, f2);
 	    if (f2.fd < MAX_LOSSLESS_FLOAT && f2.fd > MIN_LOSSLESS_FLOAT) {
-		// Float is within the no loss limit
+		/* Float is within the no loss limit */
 		f1.fd = signed_val(aw);
 		j = float_comp(f1.fd, f2.fd);
 #if ERTS_SIZEOF_ETERM == 8
 	    } else if (f2.fd > (double) (MAX_SMALL + 1)) {
-		// Float is a positive bignum, i.e. bigger
+		/* Float is a positive bignum, i.e. bigger */
 		j = -1;
 	    } else if (f2.fd < (double) (MIN_SMALL - 1)) {
-		// Float is a negative bignum, i.e. smaller
+		/* Float is a negative bignum, i.e. smaller */
 		j = 1;
-	    } else { // Float is a Sint but less precise
+	    } else {
+		/* Float is a Sint but less precise */
 		j = signed_val(aw) - (Sint) f2.fd;
 	    }
 #else
 	    } else {
-		// If float is positive it is bigger than small
+		/* If float is positive it is bigger than small */
 		j = (f2.fd > 0.0) ? -1 : 1;
 	    }
-#endif // ERTS_SIZEOF_ETERM == 8
+#endif /* ERTS_SIZEOF_ETERM == 8 */
 	    break;
         case FLOAT_BIG:
 	{
@@ -2743,18 +2744,18 @@ tailrecur_ne:
 	    GET_DOUBLE(bw, f2);
 	    if ((f2.fd < (double) (MAX_SMALL + 1))
 		    && (f2.fd > (double) (MIN_SMALL - 1))) {
-		// Float is a Sint
+		/* Float is a Sint */
 		j = big_sign(aw) ? -1 : 1;
 	    } else if (big_arity(aw) > BIG_ARITY_FLOAT_MAX
 		       || pow(2.0,(big_arity(aw)-1)*D_EXP) > fabs(f2.fd)) {
-		// If bignum size shows that it is bigger than the abs float
+		/* If bignum size shows that it is bigger than the abs float */
 		j = big_sign(aw) ? -1 : 1;
 	    } else if (big_arity(aw) < BIG_ARITY_FLOAT_MAX
 		       && (pow(2.0,(big_arity(aw))*D_EXP)-1.0) < fabs(f2.fd)) {
-		// If bignum size shows that it is smaller than the abs float
+		/* If bignum size shows that it is smaller than the abs float */
 		j = f2.fd < 0 ? 1 : -1;
 	    } else if (f2.fd < MAX_LOSSLESS_FLOAT && f2.fd > MIN_LOSSLESS_FLOAT) {
-		// Float is within the no loss limit
+		/* Float is within the no loss limit */
 		if (big_to_double(aw, &f1.fd) < 0) {
 		    j = big_sign(aw) ? -1 : 1;
 		} else {
@@ -2771,25 +2772,26 @@ tailrecur_ne:
 	case FLOAT_SMALL:
 	    GET_DOUBLE(aw, f1);
 	    if (f1.fd < MAX_LOSSLESS_FLOAT && f1.fd > MIN_LOSSLESS_FLOAT) {
-		// Float is within the no loss limit
+		/* Float is within the no loss limit */
 		f2.fd = signed_val(bw);
 		j = float_comp(f1.fd, f2.fd);
 #if ERTS_SIZEOF_ETERM == 8
 	    } else if (f1.fd > (double) (MAX_SMALL + 1)) {
-		// Float is a positive bignum, i.e. bigger
+		/* Float is a positive bignum, i.e. bigger */
 		j = 1;
 	    } else if (f1.fd < (double) (MIN_SMALL - 1)) {
-		// Float is a negative bignum, i.e. smaller
+		/* Float is a negative bignum, i.e. smaller */
 		j = -1;
-	    } else { // Float is a Sint but less precise it
+	    } else {
+		/* Float is a Sint but less precise it */
 		j = (Sint) f1.fd - signed_val(bw);
 	    }
 #else
 	    } else {
-		// If float is positive it is bigger than small
+		/* If float is positive it is bigger than small */
 		j = (f1.fd > 0.0) ? 1 : -1;
 	    }
-#endif // ERTS_SIZEOF_ETERM == 8
+#endif /* ERTS_SIZEOF_ETERM == 8 */
 	    break;
 	default:
 	    j = b_tag - a_tag;