Remove extern "C" barriers to using C++. (2d4121c0) · Commits · e / os / android_system_core

adb/adb.h

+6 −20

Original line number	Diff line number	Diff line
		@@ -23,10 +23,6 @@
		#include "adb_trace.h"
		#include "fdevent.h"

		#ifdef __cplusplus
		extern "C" {
		#endif

		#define MAX_PAYLOAD 4096

		#define A_SYNC 0x434e5953
		@@ -47,14 +43,8 @@ extern "C" {
		// Increment this when we want to force users to start a new adb server.
		#define ADB_SERVER_VERSION 32

		typedef struct amessage amessage;
		typedef struct apacket apacket;
		typedef struct asocket asocket;
		typedef struct alistener alistener;
		typedef struct aservice aservice;
		typedef struct atransport atransport;
		typedef struct adisconnect adisconnect;
		typedef struct usb_handle usb_handle;
		struct atransport;
		struct usb_handle;

		struct amessage {
		unsigned command; /* command identifier constant */
		@@ -171,12 +161,12 @@ struct adisconnect
		** object, it's a special value used to indicate that a client wants to
		** connect to a service implemented within the ADB server itself.
		*/
		typedef enum transport_type {
		enum transport_type {
		kTransportUsb,
		kTransportLocal,
		kTransportAny,
		kTransportHost,
		} transport_type;
		};

		#define TOKEN_SIZE 20

		@@ -363,10 +353,10 @@ extern const char *adb_device_banner;
		extern int HOST;
		extern int SHELL_EXIT_NOTIFY_FD;

		typedef enum {
		enum subproc_mode {
		SUBPROC_PTY = 0,
		SUBPROC_RAW = 1,
		} subproc_mode;
		} ;

		#define CHUNK_SIZE (64*1024)

		@@ -389,8 +379,4 @@ void handle_offline(atransport *t);

		void send_connect(atransport *t);

		#ifdef __cplusplus
		}
		#endif

		#endif

+0 −8

Original line number	Diff line number	Diff line
		@@ -19,10 +19,6 @@

		#include "adb.h"

		#ifdef __cplusplus
		extern "C" {
		#endif

		extern int auth_enabled;

		int adb_auth_keygen(const char* filename);
		@@ -68,8 +64,4 @@ void adb_auth_confirm_key(unsigned char data, size_t len, atransport t);

		#endif // ADB_HOST

		#ifdef __cplusplus
		}
		#endif

		#endif // __ADB_AUTH_H

+0 −8

Original line number	Diff line number	Diff line
		@@ -3,10 +3,6 @@

		#include "adb.h"

		#ifdef __cplusplus
		extern "C" {
		#endif

		/* connect to adb, connect to the named service, and return
		** a valid fd for interacting with that service upon success
		** or a negative number on failure
		@@ -58,8 +54,4 @@ const char *adb_error(void);
		*/
		int adb_status(int fd);

		#ifdef __cplusplus
		}
		#endif

		#endif

+0 −8

Original line number	Diff line number	Diff line
		@@ -20,10 +20,6 @@
		#include <stdbool.h>
		#include <sys/types.h>

		#ifdef __cplusplus
		extern "C" {
		#endif

		/*
		* Reads exactly len bytes from fd into buf.
		*
		@@ -46,8 +42,4 @@ bool WriteFdExactly(int fd, const void *buf, size_t len);
		/* Same as WriteFdExactly, but with an implicit len = strlen(buf). */
		bool WriteStringFully(int fd, const char* str);

		#ifdef __cplusplus
		}
		#endif

		#endif /* ADB_IO_H */

+2 −10

Original line number	Diff line number	Diff line
		@@ -19,17 +19,13 @@

		#include "adb.h"

		#ifdef __cplusplus
		extern "C" {
		#endif

		// error/status codes for install_listener.
		typedef enum {
		enum install_status_t {
		INSTALL_STATUS_OK = 0,
		INSTALL_STATUS_INTERNAL_ERROR = -1,
		INSTALL_STATUS_CANNOT_BIND = -2,
		INSTALL_STATUS_CANNOT_REBIND = -3,
		} install_status_t;
		};

		extern alistener listener_list;

		@@ -47,8 +43,4 @@ int format_listeners(char* buf, size_t buflen);
		int remove_listener(const char local_name, atransport transport);
		void remove_all_listeners(void);

		#ifdef __cplusplus
		}
		#endif

		#endif /* __ADB_LISTENERS_H */