--- parser3/src/main/pa_string.C	2020/10/10 06:08:37	1.263
+++ parser3/src/main/pa_string.C	2020/12/02 15:25:41	1.265
@@ -12,7 +12,7 @@
 #include "pa_charset.h"
 #include "pa_vregex.h"
 
-volatile const char * IDENT_PA_STRING_C="$Id: pa_string.C,v 1.263 2020/10/10 06:08:37 moko Exp $" IDENT_PA_STRING_H;
+volatile const char * IDENT_PA_STRING_C="$Id: pa_string.C,v 1.265 2020/12/02 15:25:41 moko Exp $" IDENT_PA_STRING_H;
 
 const String String::Empty;
 
@@ -92,14 +92,14 @@ unsigned int pa_atoui(const char *str, i
 	return pa_ato_any<unsigned int>(str, base, problem_source, UINT_MAX);
 }
 
-unsigned long long pa_atoul(const char *str, int base, const String* problem_source){
+uint64_t pa_atoul(const char *str, int base, const String* problem_source){
 	if(!str)
 		return 0;
 
-	return pa_ato_any<unsigned long long int>(str, base, problem_source, ULLONG_MAX);
+	return pa_ato_any<uint64_t>(str, base, problem_source, ULLONG_MAX);
 }
 
-int pa_atoi(const char* str, const String* problem_source) {
+int pa_atoi(const char* str, int base, const String* problem_source) {
 	if(!str)
 		return 0;
 
@@ -117,7 +117,7 @@ int pa_atoi(const char* str, const Strin
 		str++;
 	}
 
-	unsigned int result=pa_atoui(str, 0, problem_source);
+	unsigned int result=pa_atoui(str, base, problem_source);
 
 	if(negative && result <= ((unsigned int)(-(1+INT_MIN)))+1)
 		return -(int)result;