Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37e933a7 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Add extern "C" to all the headers."

parents ff934d02 d808d219

minadbd/adb.h

+8 −0
Original line number Diff line number Diff line
@@ -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

minadbd/fdevent.h

+7 −0
Original line number Diff line number Diff line
@@ -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

minadbd/fuse_adb_provider.h

+8 −0
Original line number Diff line number Diff line
@@ -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

minadbd/sysdeps.h

+12 −0
Original line number Diff line number Diff line
@@ -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 */

minadbd/transport.h

+9 −0
Original line number Diff line number Diff line
@@ -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 */