Merge remote-tracking branch 'upstream/master'

Conflicts: testcode/lib/tinyshell.c
2013-09-12 13:24:35 +02:00
parent f39cb2fb73 6466826dc8
commit 3d0ebef0f5
2 changed files with 21 additions and 5 deletions
--- a/libsrc/common/strtol.c
+++ b/libsrc/common/strtol.c
@@ -102,7 +102,7 @@ long __fastcall__ strtol (const char* nptr, char** endptr, int base)
     */
    if (endptr) {
        if (CvtCount > 0) {
-            *endptr = (char*) S - 1;
+            *endptr = (char*) S;
        } else {
            *endptr = (char*) nptr;
        }