diff options
Diffstat (limited to 'adb/transport.h')
| -rw-r--r-- | adb/transport.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/adb/transport.h b/adb/transport.h index 36a0e40..a2077e8 100644 --- a/adb/transport.h +++ b/adb/transport.h @@ -17,14 +17,11 @@ #ifndef __TRANSPORT_H #define __TRANSPORT_H -#include <stdbool.h> #include <sys/types.h> -#include "adb.h" +#include <string> -#ifdef __cplusplus -extern "C" { -#endif +#include "adb.h" #if ADB_TRACE void dump_hex(const unsigned char* ptr, size_t len); @@ -37,7 +34,7 @@ void dump_hex(const unsigned char* ptr, size_t len); * If no suitable transport is found, error is set. */ atransport* acquire_one_transport(int state, transport_type ttype, - const char* serial, const char** error_out); + const char* serial, std::string* error_out); void add_transport_disconnect(atransport* t, adisconnect* dis); void remove_transport_disconnect(atransport* t, adisconnect* dis); void kick_transport(atransport* t); @@ -74,8 +71,4 @@ void send_packet(apacket* p, atransport* t); asocket* create_device_tracker(void); -#ifdef __cplusplus -} -#endif - #endif /* __TRANSPORT_H */ |