From 4c4bbd31f52845de70f5b828121eeea62f8b4514 Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Fri, 3 Oct 2014 15:51:43 +0200 Subject: Avoid exporting non-public symbols --- common/Makefile.am | 2 +- common/debug.c | 3 ++- common/debug.h | 16 ++++------------ 3 files changed, 7 insertions(+), 14 deletions(-) (limited to 'common') diff --git a/common/Makefile.am b/common/Makefile.am index b5ea6c1..eb1db28 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusbmuxd_CFLAGS) $(libplist_CFLAGS) $(LFS_CFLAGS) AM_LDFLAGS = $(libusbmuxd_LIBS) $(libplist_LIBS) ${libpthread_LIBS} diff --git a/common/debug.c b/common/debug.c index 2cc9db1..a7e33df 100644 --- a/common/debug.c +++ b/common/debug.c @@ -32,6 +32,7 @@ #include #include "debug.h" +#include "idevice.h" #include "libimobiledevice/libimobiledevice.h" #ifndef STRIP_DEBUG_CODE @@ -46,7 +47,7 @@ int debug_level = 0; * * @param level Set to 0 for no debugging or 1 for debugging. */ -void idevice_set_debug_level(int level) +LIBIMOBILEDEVICE_API void idevice_set_debug_level(int level) { debug_level = level; } diff --git a/common/debug.h b/common/debug.h index 3a66ee4..99a94b7 100644 --- a/common/debug.h +++ b/common/debug.h @@ -25,14 +25,6 @@ #include -#ifndef LIBIMOBILEDEVICE_INTERNAL -#ifdef WIN32 -#define LIBIMOBILEDEVICE_INTERNAL -#else -#define LIBIMOBILEDEVICE_INTERNAL __attribute__((visibility("hidden"))) -#endif -#endif - #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && !defined(STRIP_DEBUG_CODE) #define debug_info(...) debug_info_real (__func__, __FILE__, __LINE__, __VA_ARGS__) #define debug_plist(a) debug_plist_real (__func__, __FILE__, __LINE__, a) @@ -44,14 +36,14 @@ #define debug_plist(a) #endif -LIBIMOBILEDEVICE_INTERNAL void debug_info_real(const char *func, +void debug_info_real(const char *func, const char *file, int line, const char *format, ...); -LIBIMOBILEDEVICE_INTERNAL void debug_buffer(const char *data, const int length); -LIBIMOBILEDEVICE_INTERNAL void debug_buffer_to_file(const char *file, const char *data, const int length); -LIBIMOBILEDEVICE_INTERNAL void debug_plist_real(const char *func, +void debug_buffer(const char *data, const int length); +void debug_buffer_to_file(const char *file, const char *data, const int length); +void debug_plist_real(const char *func, const char *file, int line, plist_t plist); -- cgit v1.1-32-gdbae