diff options
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/libusbmuxd.c | 38 |
2 files changed, 28 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 93c01c5..09266fd 100644 --- a/configure.ac +++ b/configure.ac @@ -81,9 +81,14 @@ if test "x$win32" != "xtrue"; then AC_CHECK_LIB(pthread, [pthread_create, pthread_mutex_lock], [AC_SUBST(libpthread_LIBS,[-lpthread])], [AC_MSG_ERROR([libpthread is required to build libusbmuxd])]) fi -AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wmissing-declarations -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings -Wswitch-default -Wno-unused-parameter") +AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wmissing-declarations -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings -Wswitch-default -Wno-unused-parameter -fvisibility=hidden") AC_SUBST(GLOBAL_CFLAGS) +case "$GLOBAL_CFLAGS" in + *-fvisibility=hidden*) + AC_DEFINE([HAVE_FVISIBILITY], [1], [Define if compiled with -fvisibility=hidden]) +esac + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_OUTPUT([ diff --git a/src/libusbmuxd.c b/src/libusbmuxd.c index 738532f..a26b835 100644 --- a/src/libusbmuxd.c +++ b/src/libusbmuxd.c @@ -30,6 +30,12 @@ #include <config.h> #endif +#ifdef HAVE_FVISIBILITY +#define USBMUXD_API __attribute__((visibility("default"))) +#else +#define USBMUXD_API +#endif + #ifdef WIN32 #include <windows.h> #include <winsock2.h> @@ -738,7 +744,7 @@ static void *device_monitor(void *data) return NULL; } -int usbmuxd_subscribe(usbmuxd_event_cb_t callback, void *user_data) +USBMUXD_API int usbmuxd_subscribe(usbmuxd_event_cb_t callback, void *user_data) { int res; @@ -763,7 +769,7 @@ int usbmuxd_subscribe(usbmuxd_event_cb_t callback, void *user_data) return 0; } -int usbmuxd_unsubscribe() +USBMUXD_API int usbmuxd_unsubscribe() { event_cb = NULL; @@ -806,7 +812,7 @@ static usbmuxd_device_info_t *device_info_from_device_record(struct usbmuxd_devi return devinfo; } -int usbmuxd_get_device_list(usbmuxd_device_info_t **device_list) +USBMUXD_API int usbmuxd_get_device_list(usbmuxd_device_info_t **device_list) { int sfd; int tag; @@ -959,7 +965,7 @@ got_device_list: return dev_cnt; } -int usbmuxd_device_list_free(usbmuxd_device_info_t **device_list) +USBMUXD_API int usbmuxd_device_list_free(usbmuxd_device_info_t **device_list) { if (device_list) { free(*device_list); @@ -967,7 +973,7 @@ int usbmuxd_device_list_free(usbmuxd_device_info_t **device_list) return 0; } -int usbmuxd_get_device_by_udid(const char *udid, usbmuxd_device_info_t *device) +USBMUXD_API int usbmuxd_get_device_by_udid(const char *udid, usbmuxd_device_info_t *device) { usbmuxd_device_info_t *dev_list = NULL; @@ -1002,7 +1008,7 @@ int usbmuxd_get_device_by_udid(const char *udid, usbmuxd_device_info_t *device) return result; } -int usbmuxd_connect(const int handle, const unsigned short port) +USBMUXD_API int usbmuxd_connect(const int handle, const unsigned short port) { int sfd; int tag; @@ -1047,12 +1053,12 @@ retry: return -1; } -int usbmuxd_disconnect(int sfd) +USBMUXD_API int usbmuxd_disconnect(int sfd) { return socket_close(sfd); } -int usbmuxd_send(int sfd, const char *data, uint32_t len, uint32_t *sent_bytes) +USBMUXD_API int usbmuxd_send(int sfd, const char *data, uint32_t len, uint32_t *sent_bytes) { int num_sent; @@ -1075,7 +1081,7 @@ int usbmuxd_send(int sfd, const char *data, uint32_t len, uint32_t *sent_bytes) return 0; } -int usbmuxd_recv_timeout(int sfd, char *data, uint32_t len, uint32_t *recv_bytes, unsigned int timeout) +USBMUXD_API int usbmuxd_recv_timeout(int sfd, char *data, uint32_t len, uint32_t *recv_bytes, unsigned int timeout) { int num_recv = socket_receive_timeout(sfd, (void*)data, len, 0, timeout); if (num_recv < 0) { @@ -1088,12 +1094,12 @@ int usbmuxd_recv_timeout(int sfd, char *data, uint32_t len, uint32_t *recv_bytes return 0; } -int usbmuxd_recv(int sfd, char *data, uint32_t len, uint32_t *recv_bytes) +USBMUXD_API int usbmuxd_recv(int sfd, char *data, uint32_t len, uint32_t *recv_bytes) { return usbmuxd_recv_timeout(sfd, data, len, recv_bytes, 5000); } -int usbmuxd_read_buid(char **buid) +USBMUXD_API int usbmuxd_read_buid(char **buid) { int sfd; int tag; @@ -1134,7 +1140,7 @@ int usbmuxd_read_buid(char **buid) return ret; } -int usbmuxd_read_pair_record(const char* record_id, char **record_data, uint32_t *record_size) +USBMUXD_API int usbmuxd_read_pair_record(const char* record_id, char **record_data, uint32_t *record_size) { int sfd; int tag; @@ -1182,7 +1188,7 @@ int usbmuxd_read_pair_record(const char* record_id, char **record_data, uint32_t return ret; } -int usbmuxd_save_pair_record(const char* record_id, const char *record_data, uint32_t record_size) +USBMUXD_API int usbmuxd_save_pair_record(const char* record_id, const char *record_data, uint32_t record_size) { int sfd; int tag; @@ -1221,7 +1227,7 @@ int usbmuxd_save_pair_record(const char* record_id, const char *record_data, uin return ret; } -int usbmuxd_delete_pair_record(const char* record_id) +USBMUXD_API int usbmuxd_delete_pair_record(const char* record_id) { int sfd; int tag; @@ -1258,7 +1264,7 @@ int usbmuxd_delete_pair_record(const char* record_id) return ret; } -void libusbmuxd_set_use_inotify(int set) +USBMUXD_API void libusbmuxd_set_use_inotify(int set) { #ifdef HAVE_INOTIFY use_inotify = set; @@ -1266,7 +1272,7 @@ void libusbmuxd_set_use_inotify(int set) return; } -void libusbmuxd_set_debug_level(int level) +USBMUXD_API void libusbmuxd_set_debug_level(int level) { libusbmuxd_debug = level; socket_set_verbose(level); |