Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29c5a78f authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Fix build of adb with gcc-4.9."

parents a8d0c4a2 53723338
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -1602,9 +1602,10 @@ top:
    return 1;
}

#define MAX_ARGV_LENGTH 16
static int do_cmd(transport_type ttype, char* serial, char *cmd, ...)
{
    char *argv[16];
    char *argv[MAX_ARGV_LENGTH];
    int argc;
    va_list ap;

@@ -1621,7 +1622,9 @@ static int do_cmd(transport_type ttype, char* serial, char *cmd, ...)
    }

    argv[argc++] = cmd;
    while((argv[argc] = va_arg(ap, char*)) != 0) argc++;
    while(argc < MAX_ARGV_LENGTH &&
        (argv[argc] = va_arg(ap, char*)) != 0) argc++;
    assert(argc < MAX_ARGV_LENGTH);
    va_end(ap);

#if 0