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

Commit 87378814 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "adb shell: Win32: fix Ctrl-C, tab completion, line editing, server echo"

parents 6e014d77 50184062

adb/commandline.cpp

+4 −7
Original line number Diff line number Diff line
@@ -245,13 +245,10 @@ int usage() 


#if defined(_WIN32)



// Windows does not have <termio.h>.

static void stdin_raw_init(int fd) {



}



static void stdin_raw_restore(int fd) {



// Implemented in sysdeps_win32.c.

extern "C" {

void stdin_raw_init(int fd);

void stdin_raw_restore(int fd);

}



#else

adb/sysdeps.h

+2 −4
Original line number Diff line number Diff line
@@ -150,10 +150,8 @@ static __inline__ int unix_close(int fd) 
#undef   close

#define  close   ____xxx_close



static __inline__  int  unix_read(int  fd, void*  buf, size_t  len)

{

    return read(fd, buf, len);

}

extern int  unix_read(int  fd, void*  buf, size_t  len);



#undef   read

#define  read  ___xxx_read