Merge branch 'str2int' of github.com:xyb/micropython into xyb-str2int

Conflicts:
	py/objint.c
	unix-cpy/Makefile
	unix/Makefile

1 files changed, 2 insertions, 0 deletions

diff --git a/py/misc.h b/py/misc.h
index e985bc5253..5b012d03dc 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -50,6 +50,8 @@ bool unichar_isdigit(unichar c);
 #define streq(s1, s2) (strcmp((s1), (s2)) == 0)
 */
 
+long strtonum(const char *restrict s, int base);
+
 /** variable string *********************************************/
 
 typedef struct _vstr_t {