Merge branch 'devel' of https://github.com/cesnet/libyang into devel
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a2b498..5f13502 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@
 # set version
 set(LIBYANG_MAJOR_VERSION 0)
 set(LIBYANG_MINOR_VERSION 13)
-set(LIBYANG_MICRO_VERSION 24)
+set(LIBYANG_MICRO_VERSION 25)
 set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION})
 set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION})
 configure_file(${PROJECT_SOURCE_DIR}/src/libyang.h.in ${PROJECT_SOURCE_DIR}/src/libyang.h)
diff --git a/src/resolve.c b/src/resolve.c
index a9ea9ea..803a123 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -2636,9 +2636,9 @@
         }
         if (isdigit(ptr[0]) || (ptr[0] == '+') || (ptr[0] == '-')) {
             if (kind == 0) {
-                tmp_local_intv->value.uval.min = strtol(ptr, (char **)&ptr, 10);
+                tmp_local_intv->value.uval.min = strtoll(ptr, (char **)&ptr, 10);
             } else if (kind == 1) {
-                tmp_local_intv->value.sval.min = strtol(ptr, (char **)&ptr, 10);
+                tmp_local_intv->value.sval.min = strtoll(ptr, (char **)&ptr, 10);
             } else if (kind == 2) {
                 if (parse_range_dec64(&ptr, local_fdig, &tmp_local_intv->value.fval.min)) {
                     LOGVAL(LYE_INARG, LY_VLOG_NONE, NULL, ptr, "range");
@@ -2693,9 +2693,9 @@
             /* max */
             if (isdigit(ptr[0]) || (ptr[0] == '+') || (ptr[0] == '-')) {
                 if (kind == 0) {
-                    tmp_local_intv->value.uval.max = strtol(ptr, (char **)&ptr, 10);
+                    tmp_local_intv->value.uval.max = strtoll(ptr, (char **)&ptr, 10);
                 } else if (kind == 1) {
-                    tmp_local_intv->value.sval.max = strtol(ptr, (char **)&ptr, 10);
+                    tmp_local_intv->value.sval.max = strtoll(ptr, (char **)&ptr, 10);
                 } else if (kind == 2) {
                     if (parse_range_dec64(&ptr, local_fdig, &tmp_local_intv->value.fval.max)) {
                         LOGVAL(LYE_INARG, LY_VLOG_NONE, NULL, ptr, "range");