From: Jean Privat <jean@pryen.org>
Date: Wed, 3 Jun 2015 01:58:38 +0000 (-0400)
Subject: Merge: Fix for Android
X-Git-Tag: v0.7.6~70
X-Git-Url: http://nitlanguage.org?hp=e8ce370eb3f8b7857783e3a028799542de57f00d

Merge: Fix for Android

Pull-Request: #1429
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
Reviewed-by: Jean Privat <jean@pryen.org>
---

diff --git a/lib/binary/binary.nit b/lib/binary/binary.nit
index 59ec88d..10d9017 100644
--- a/lib/binary/binary.nit
+++ b/lib/binary/binary.nit
@@ -45,10 +45,13 @@ in "C" `{
 	#include <endian.h>
 
 	// Android compatibility
+	#ifndef be32toh
+		#define be32toh(val) betoh32(val)
+		#define le32toh(val) letoh32(val)
+	#endif
+
 	#ifndef be64toh
 		#define be64toh(val) betoh64(val)
-	#endif
-	#ifndef le64toh
 		#define le64toh(val) letoh64(val)
 	#endif
 `}
diff --git a/lib/mnit_android/android_assets.nit b/lib/mnit_android/android_assets.nit
index 51e1ec8..6531035 100644
--- a/lib/mnit_android/android_assets.nit
+++ b/lib/mnit_android/android_assets.nit
@@ -231,7 +231,7 @@ redef universal Int
 	# The first power of `exp` greater or equal to `self`
 	private fun next_pow(exp: Int): Int
 	do
-		var p = 0
+		var p = 1
 		while p < self do p = p*exp
 		return p
 	end