summaryrefslogtreecommitdiffstats
path: root/adb/adb.h
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-02-25 17:51:28 -0800
committerDan Albert <danalbert@google.com>2015-03-09 14:06:11 -0700
commitbac3474a8256cb32a29e8d46f78cad95a5502692 (patch)
tree9763c3cb2f5e640c7061cffb47d61274a37baab8 /adb/adb.h
parent9b1fd969a7b7f1c6f1ed19719f21d57001d3c461 (diff)
downloadsystem_core-bac3474a8256cb32a29e8d46f78cad95a5502692.zip
system_core-bac3474a8256cb32a29e8d46f78cad95a5502692.tar.gz
system_core-bac3474a8256cb32a29e8d46f78cad95a5502692.tar.bz2
Move adb to C++.
I keep trying to clean things up and needing std::strings. Might as well just do this now. usb_linux_client.c is going to stay as C because GCC isn't smart enough to deal with the designated initializers it uses (though for some reason it is in C mode). The Darwin files are staying as C because I don't have a way to test that they build. The Windows files are staying as C because while I can actually build for them, it's slow and painful. Change-Id: I75367d29205a9049d34460032b3bb36384f43941
Diffstat (limited to 'adb/adb.h')
-rw-r--r--adb/adb.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/adb/adb.h b/adb/adb.h
index 9a68871..1aeac6b 100644
--- a/adb/adb.h
+++ b/adb/adb.h
@@ -239,8 +239,8 @@ struct alistener
fdevent fde;
int fd;
- const char *local_name;
- const char *connect_to;
+ char *local_name;
+ char *connect_to;
atransport *transport;
adisconnect disconnect;
};
@@ -348,7 +348,7 @@ void usb_kick(usb_handle *h);
int is_adb_interface(int vid, int pid, int usb_class, int usb_subclass, int usb_protocol);
#endif
-int adb_commandline(int argc, char **argv);
+int adb_commandline(int argc, const char **argv);
int connection_state(atransport *t);