diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-17 09:47:42 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-04-17 09:47:42 -0700 |
| commit | 2d4121c0dcc93382bcd7ea6476f433d8254919dd (patch) | |
| tree | bdd8ab4be041d06fc50418b4a99fcb8b5a81b07a /adb/jdwp_service.cpp | |
| parent | a4802ca08bfcbf0124f5e9b959ed4e3a198d5f46 (diff) | |
| download | system_core-2d4121c0dcc93382bcd7ea6476f433d8254919dd.tar.gz system_core-2d4121c0dcc93382bcd7ea6476f433d8254919dd.tar.bz2 system_core-2d4121c0dcc93382bcd7ea6476f433d8254919dd.zip | |
Remove extern "C" barriers to using C++.
Change-Id: Ic046d6aa540738cb46b54531bc59ba3b47b0136d
Diffstat (limited to 'adb/jdwp_service.cpp')
| -rw-r--r-- | adb/jdwp_service.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/adb/jdwp_service.cpp b/adb/jdwp_service.cpp index 9cf084e0f..c0f7ec273 100644 --- a/adb/jdwp_service.cpp +++ b/adb/jdwp_service.cpp @@ -121,7 +121,6 @@ #include <sys/socket.h> #include <sys/un.h> -typedef struct JdwpProcess JdwpProcess; struct JdwpProcess { JdwpProcess* next; JdwpProcess* prev; @@ -455,11 +454,10 @@ FoundIt: #define JDWP_CONTROL_NAME "\0jdwp-control" #define JDWP_CONTROL_NAME_LEN (sizeof(JDWP_CONTROL_NAME)-1) -typedef struct { +struct JdwpControl { int listen_socket; fdevent* fde; - -} JdwpControl; +}; static void @@ -570,10 +568,10 @@ static JdwpControl _jdwp_control; ** this simply returns the list of known JDWP process pids **/ -typedef struct { +struct JdwpSocket { asocket socket; int pass; -} JdwpSocket; +}; static void jdwp_socket_close( asocket* s ) @@ -642,8 +640,6 @@ create_jdwp_service_socket( void ) ** to the client... **/ -typedef struct JdwpTracker JdwpTracker; - struct JdwpTracker { asocket socket; JdwpTracker* next; @@ -754,4 +750,3 @@ init_jdwp(void) } #endif /* !ADB_HOST */ - |