Merge latest master into qbootstrap, especially to get mark commit fi…

…xes.
Raku · May 17, 2012 · 082a2de · 082a2de
2 parents d6e4019 + 215243f
commit 082a2de
Show file tree

Hide file tree

Showing 29 changed files with 1,021 additions and 130 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ Makefile
 *.dump
 *.exe
 *.suo
+*.bundle
 *~
 *.pbc
 src/ops/*.h

diff --git a/3rdparty/dyncall/GNUmakefile b/3rdparty/dyncall/GNUmakefile
@@ -20,7 +20,7 @@
 #
 
 # FIXME: workaround for Parrot issue #735
-CFLAGS	  := $(CFLAGS) -w
+CFLAGS += -Wno-strict-prototypes
 
 TOP 	   = .
 GMAKE_TOP ?= $(TOP)/buildsys/gmake

diff --git a/3rdparty/libtommath/bn_mp_radix_size.c b/3rdparty/libtommath/bn_mp_radix_size.c
@@ -24,12 +24,6 @@ int mp_radix_size (mp_int * a, int radix, int *size)
 
   *size = 0;
 
-  /* special case for binary */
-  if (radix == 2) {
-    *size = mp_count_bits (a) + (a->sign == MP_NEG ? 1 : 0) + 1;
-    return MP_OKAY;
-  }
-
   /* make sure the radix is in range */
   if (radix < 2 || radix > 64) {
     return MP_VAL;
@@ -40,6 +34,12 @@ int mp_radix_size (mp_int * a, int radix, int *size)
     return MP_OKAY;
   }
 
+  /* special case for binary */
+  if (radix == 2) {
+    *size = mp_count_bits (a) + (a->sign == MP_NEG ? 1 : 0) + 1;
+    return MP_OKAY;
+  }
+
   /* digs is the digit count */
   digs = 0;
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2012.04
+2012.04.1