6 files changed, 52 insertions, 0 deletions

diff --git a/minadbd/adb.h b/minadbd/adb.h
index 714868f5c..010a36485 100644
--- a/minadbd/adb.h
+++ b/minadbd/adb.h
@@ -22,6 +22,10 @@
 #include "transport.h"  /* readx(), writex() */
 #include "fdevent.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MAX_PAYLOAD 4096
 
 #define A_SYNC 0x434e5953
@@ -421,4 +425,8 @@ extern int SHELL_EXIT_NOTIFY_FD;
 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
diff --git a/minadbd/fdevent.h b/minadbd/fdevent.h
index a0ebe2a7e..38b08cce1 100644
--- a/minadbd/fdevent.h
+++ b/minadbd/fdevent.h
@@ -19,6 +19,10 @@
 
 #include <stdint.h>  /* for int64_t */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* events that may be observed */
 #define FDE_READ              0x0001
 #define FDE_WRITE             0x0002
@@ -79,5 +83,8 @@ struct fdevent
     void *arg;
 };
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif
diff --git a/minadbd/fuse_adb_provider.h b/minadbd/fuse_adb_provider.h
index 0eb1f79d1..23de44ab2 100644
--- a/minadbd/fuse_adb_provider.h
+++ b/minadbd/fuse_adb_provider.h
@@ -17,6 +17,14 @@
 #ifndef __FUSE_ADB_PROVIDER_H
 #define __FUSE_ADB_PROVIDER_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int run_adb_fuse(int sfd, uint64_t file_size, uint32_t block_size);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/minadbd/sysdeps.h b/minadbd/sysdeps.h
index 800ddb753..3edaef472 100644
--- a/minadbd/sysdeps.h
+++ b/minadbd/sysdeps.h
@@ -36,6 +36,10 @@
 #include <errno.h>
 #include <ctype.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define OS_PATH_SEPARATOR '\\'
 #define OS_PATH_SEPARATOR_STR "\\"
 
@@ -254,6 +258,10 @@ static __inline__  int  adb_is_absolute_host_path( const char*  path )
     return isalpha(path[0]) && path[1] == ':' && path[2] == '\\';
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #else /* !_WIN32 a.k.a. Unix */
 
 #include "fdevent.h"
@@ -491,4 +499,8 @@ static __inline__  int  adb_is_absolute_host_path( const char*  path )
 
 #endif /* !_WIN32 */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _ADB_SYSDEPS_H */
diff --git a/minadbd/transport.h b/minadbd/transport.h
index 992e05285..c1b8ff34f 100644
--- a/minadbd/transport.h
+++ b/minadbd/transport.h
@@ -17,10 +17,19 @@
 #ifndef __TRANSPORT_H
 #define __TRANSPORT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* convenience wrappers around read/write that will retry on
 ** EINTR and/or short read/write.  Returns 0 on success, -1
 ** on error or EOF.
 */
 int readx(int fd, void *ptr, size_t len);
 int writex(int fd, const void *ptr, size_t len);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif   /* __TRANSPORT_H */
diff --git a/minadbd/utils.h b/minadbd/utils.h
index f70ecd24d..e833820ab 100644
--- a/minadbd/utils.h
+++ b/minadbd/utils.h
@@ -16,6 +16,10 @@
 #ifndef _ADB_UTILS_H
 #define _ADB_UTILS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* bounded buffer functions */
 
 /* all these functions are used to append data to a bounded buffer.
@@ -65,4 +69,8 @@ char*   buff_add  (char*  buff, char*  buffEnd, const char*  format, ... );
 #define  BUFF_DECL(_buff,_cursor,_end,_size)   \
     char   _buff[_size], *_cursor=_buff, *_end = _cursor + (_size)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _ADB_UTILS_H */