Merge pull request #1431 from svaarala/fix-netsurf-compile-issues

Fix NetSurf compile issues

RELEASES.rst

@@ -2668,7 +2668,10 @@ Planned
   rather than duk_heaphdr_decref_norz()); however, this function is unused
   unless fast refcount handling is disabled explicitly (GH-1410)
 
-* Avoid log2(), log10(), cbrt(), and trunc() on Android (GH-1325, GH-1341)
+* Fix alignment increase warning with clang (GH-1430, GH-1431)
+
+* Avoid log2(), log10(), cbrt(), and trunc() on Android and Atari MiNT
+  (GH-1325, GH-1341, GH-1430, GH-1431)
 
 * Portability improvements for Solaris, HPUX, and AIX (GH-1356)
 

config/header-snippets/platform_fillins.h.in

@@ -273,7 +273,8 @@
  * these functions also exist in MSVC 2013 and later so include a clause for
  * that too.  Android doesn't have log2; disable all of these for Android.
  */
-#if (defined(DUK_F_C99) || defined(DUK_F_CPP11) || (defined(_MSC_VER) && (_MSC_VER >= 1800))) && !defined(DUK_F_ANDROID)
+#if (defined(DUK_F_C99) || defined(DUK_F_CPP11) || (defined(_MSC_VER) && (_MSC_VER >= 1800))) && \
+    !defined(DUK_F_ANDROID) && !defined(DUK_F_MINT)
 #if !defined(DUK_CBRT)
 #define DUK_CBRT             cbrt
 #endif

src-input/duk_js_var.c

@@ -580,7 +580,7 @@ void duk_js_init_activation_environment_records_delayed(duk_hthread *thr,
 
 	env = duk_create_activation_environment_record(thr, func, act->idx_bottom);
 	DUK_ASSERT(env != NULL);
-	act = (duk_activation *) ((duk_uint8_t *) thr->callstack + act_off);
+	act = (duk_activation *) (void *) ((duk_uint8_t *) thr->callstack + act_off);
 
 	DUK_DDD(DUK_DDDPRINT("created delayed fresh env: %!ipO", (duk_heaphdr *) env));
 #if defined(DUK_USE_DEBUG_LEVEL) && (DUK_USE_DEBUG_LEVEL >= 2)
@@ -1744,7 +1744,7 @@ duk_bool_t duk_js_declvar_activation(duk_hthread *thr,
 	if (!act->var_env) {
 		DUK_ASSERT(act->lex_env == NULL);
 		duk_js_init_activation_environment_records_delayed(thr, act);
-		act = (duk_activation *) ((duk_uint8_t *) thr->callstack + act_off);
+		act = (duk_activation *) (void *) ((duk_uint8_t *) thr->callstack + act_off);
 	}
 	DUK_ASSERT(act->lex_env != NULL);
 	DUK_ASSERT(act->var_env != NULL);