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/file_sync_service.h | |
| parent | a4802ca08bfcbf0124f5e9b959ed4e3a198d5f46 (diff) | |
| download | system_core-2d4121c0dcc93382bcd7ea6476f433d8254919dd.zip system_core-2d4121c0dcc93382bcd7ea6476f433d8254919dd.tar.gz system_core-2d4121c0dcc93382bcd7ea6476f433d8254919dd.tar.bz2 | |
Remove extern "C" barriers to using C++.
Change-Id: Ic046d6aa540738cb46b54531bc59ba3b47b0136d
Diffstat (limited to 'adb/file_sync_service.h')
| -rw-r--r-- | adb/file_sync_service.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/adb/file_sync_service.h b/adb/file_sync_service.h index 5b69a63..6e1ccce 100644 --- a/adb/file_sync_service.h +++ b/adb/file_sync_service.h @@ -17,10 +17,6 @@ #ifndef _FILE_SYNC_SERVICE_H_ #define _FILE_SYNC_SERVICE_H_ -#ifdef __cplusplus -extern "C" { -#endif - #define htoll(x) (x) #define ltohl(x) (x) @@ -38,7 +34,7 @@ extern "C" { #define ID_FAIL MKID('F','A','I','L') #define ID_QUIT MKID('Q','U','I','T') -typedef union { +union syncmsg { unsigned id; struct { unsigned id; @@ -65,7 +61,7 @@ typedef union { unsigned id; unsigned msglen; } status; -} syncmsg; +} ; void file_sync_service(int fd, void *cookie); @@ -76,8 +72,4 @@ int do_sync_pull(const char *rpath, const char *lpath, int show_progress, int pu #define SYNC_DATA_MAX (64*1024) -#ifdef __cplusplus -} -#endif - #endif |