Merge "Add extern "C" to all the adb headers." (1ac334ec) · Commits · e / os / android_system_core

adb/adb.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,10 @@
		#include "fdevent.h"
		#include "transport.h" /* readx(), writex() */

		#ifdef __cplusplus
		extern "C" {
		#endif

		#define MAX_PAYLOAD 4096

		#define A_SYNC 0x434e5953
		@@ -420,4 +424,8 @@ typedef enum {
		int sendfailmsg(int fd, const char *reason);
		int handle_host_request(char service, transport_type ttype, char serial, int reply_fd, asocket *s);

		#ifdef __cplusplus
		}
		#endif

		#endif

+8 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,10 @@
		#ifndef __ADB_AUTH_H
		#define __ADB_AUTH_H

		#ifdef __cplusplus
		extern "C" {
		#endif

		void adb_auth_init(void);
		int adb_auth_keygen(const char* filename);
		void adb_auth_verified(atransport *t);
		@@ -52,4 +56,8 @@ void adb_auth_confirm_key(unsigned char data, size_t len, atransport t);

		#endif // ADB_HOST

		#ifdef __cplusplus
		}
		#endif

		#endif // __ADB_AUTH_H

+8 −0

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

		#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
		@@ -54,4 +58,8 @@ const char *adb_error(void);
		*/
		int adb_status(int fd);

		#ifdef __cplusplus
		}
		#endif

		#endif

+8 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,10 @@
		#include <android/log.h>
		#endif

		#ifdef __cplusplus
		extern "C" {
		#endif

		/* define ADB_TRACE to 1 to enable tracing support, or 0 to disable it */
		#define ADB_TRACE 1

		@@ -142,4 +146,8 @@ void adb_trace_init(void);
		# define ADB_TRACING 0
		#endif /* ADB_TRACE */

		#ifdef __cplusplus
		}
		#endif

		#endif /* __ADB_TRACE_H */

+8 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,10 @@
		#ifndef _FILE_SYNC_SERVICE_H_
		#define _FILE_SYNC_SERVICE_H_

		#ifdef __cplusplus
		extern "C" {
		#endif

		#define htoll(x) (x)
		#define ltohl(x) (x)

		@@ -72,4 +76,8 @@ 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