diff options
Diffstat (limited to 'adb/sysdeps.h')
| -rw-r--r-- | adb/sysdeps.h | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/adb/sysdeps.h b/adb/sysdeps.h index 0252ef3..66b60cc 100644 --- a/adb/sysdeps.h +++ b/adb/sysdeps.h @@ -275,22 +275,6 @@ extern char* adb_strtok_r(char *str, const char *delim, char **saveptr); #include <netinet/in.h> #include <netinet/tcp.h> #include <string.h> -#include <unistd.h> - -/* - * TEMP_FAILURE_RETRY is defined by some, but not all, versions of - * <unistd.h>. (Alas, it is not as standard as we'd hoped!) So, if it's - * not already defined, then define it here. - */ -#ifndef TEMP_FAILURE_RETRY -/* Used to retry syscalls that can return EINTR. */ -#define TEMP_FAILURE_RETRY(exp) ({ \ - typeof (exp) _rc; \ - do { \ - _rc = (exp); \ - } while (_rc == -1 && errno == EINTR); \ - _rc; }) -#endif #define OS_PATH_SEPARATOR '/' #define OS_PATH_SEPARATOR_STR "/" @@ -326,7 +310,7 @@ static __inline__ int unix_open(const char* path, int options,...) { if ((options & O_CREAT) == 0) { - return TEMP_FAILURE_RETRY( open(path, options) ); + return open(path, options); } else { @@ -335,19 +319,19 @@ static __inline__ int unix_open(const char* path, int options,...) va_start( args, options ); mode = va_arg( args, int ); va_end( args ); - return TEMP_FAILURE_RETRY( open( path, options, mode ) ); + return open(path, options, mode); } } static __inline__ int adb_open_mode( const char* pathname, int options, int mode ) { - return TEMP_FAILURE_RETRY( open( pathname, options, mode ) ); + return open( pathname, options, mode ); } static __inline__ int adb_open( const char* pathname, int options ) { - int fd = TEMP_FAILURE_RETRY( open( pathname, options ) ); + int fd = open( pathname, options ); if (fd < 0) return -1; close_on_exec( fd ); @@ -373,7 +357,7 @@ static __inline__ int adb_close(int fd) static __inline__ int adb_read(int fd, void* buf, size_t len) { - return TEMP_FAILURE_RETRY( read( fd, buf, len ) ); + return read(fd, buf, len); } #undef read @@ -381,7 +365,7 @@ static __inline__ int adb_read(int fd, void* buf, size_t len) static __inline__ int adb_write(int fd, const void* buf, size_t len) { - return TEMP_FAILURE_RETRY( write( fd, buf, len ) ); + return write(fd, buf, len); } #undef write #define write ___xxx_write @@ -402,7 +386,7 @@ static __inline__ int adb_unlink(const char* path) static __inline__ int adb_creat(const char* path, int mode) { - int fd = TEMP_FAILURE_RETRY( creat( path, mode ) ); + int fd = creat(path, mode); if ( fd < 0 ) return -1; @@ -417,7 +401,7 @@ static __inline__ int adb_socket_accept(int serverfd, struct sockaddr* addr, { int fd; - fd = TEMP_FAILURE_RETRY( accept( serverfd, addr, addrlen ) ); + fd = accept(serverfd, addr, addrlen); if (fd >= 0) close_on_exec(fd); |