diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/libstrongswan/Android.mk | 4 | ||||
-rw-r--r-- | src/libstrongswan/Makefile.am | 8 | ||||
-rw-r--r-- | src/libstrongswan/enum.h | 2 | ||||
-rw-r--r-- | src/libstrongswan/library.h | 3 | ||||
-rw-r--r-- | src/libstrongswan/utils/printf_hook.c (renamed from src/libstrongswan/printf_hook.c) | 0 | ||||
-rw-r--r-- | src/libstrongswan/utils/printf_hook.h (renamed from src/libstrongswan/printf_hook.h) | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk index 094e1bcdc..ef9f378c6 100644 --- a/src/libstrongswan/Android.mk +++ b/src/libstrongswan/Android.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) # copy-n-paste from Makefile.am LOCAL_SRC_FILES := \ -library.c chunk.c debug.c enum.c settings.c printf_hook.c \ +library.c chunk.c debug.c enum.c settings.c \ asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \ collections/blocking_queue.c collections/enumerator.c collections/hashtable.c \ collections/linked_list.c \ @@ -31,7 +31,7 @@ processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \ selectors/traffic_selector.c threading/thread.c threading/thread_value.c \ threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \ utils.c utils/identification.c utils/lexparser.c \ -utils/optionsfrom.c utils/capabilities.c utils/backtrace.c +utils/optionsfrom.c utils/capabilities.c utils/backtrace.c utils/printf_hook.c # adding the plugin source files diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 3e549afb7..77120c6e5 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -1,7 +1,7 @@ ipseclib_LTLIBRARIES = libstrongswan.la libstrongswan_la_SOURCES = \ -library.c chunk.c debug.c enum.c settings.c printf_hook.c \ +library.c chunk.c debug.c enum.c settings.c \ asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \ collections/blocking_queue.c collections/enumerator.c collections/hashtable.c \ collections/linked_list.c \ @@ -29,12 +29,12 @@ processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \ selectors/traffic_selector.c threading/thread.c threading/thread_value.c \ threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \ utils.c utils/identification.c utils/lexparser.c \ -utils/optionsfrom.c utils/capabilities.c utils/backtrace.c +utils/optionsfrom.c utils/capabilities.c utils/backtrace.c utils/printf_hook.c if USE_DEV_HEADERS strongswan_includedir = ${dev_headers} nobase_strongswan_include_HEADERS = \ -library.h chunk.h debug.h enum.h settings.h printf_hook.h \ +library.h chunk.h debug.h enum.h settings.h \ asn1/asn1.h asn1/asn1_parser.h asn1/oid.h bio/bio_reader.h bio/bio_writer.h \ collections/blocking_queue.h collections/enumerator.h collections/hashtable.h \ collections/linked_list.h \ @@ -70,7 +70,7 @@ threading/mutex.h threading/condvar.h threading/spinlock.h threading/semaphore.h threading/rwlock.h threading/rwlock_condvar.h threading/lock_profiler.h \ utils.h utils/identification.h utils/lexparser.h \ utils/optionsfrom.h utils/capabilities.h utils/backtrace.h \ -utils/leak_detective.h utils/integrity_checker.h +utils/leak_detective.h utils/printf_hook.h utils/integrity_checker.h endif library.lo : $(top_builddir)/config.status diff --git a/src/libstrongswan/enum.h b/src/libstrongswan/enum.h index 840371245..0ed606813 100644 --- a/src/libstrongswan/enum.h +++ b/src/libstrongswan/enum.h @@ -22,7 +22,7 @@ #ifndef ENUM_H_ #define ENUM_H_ -#include "printf_hook.h" +#include "utils/printf_hook.h" typedef struct enum_name_t enum_name_t; diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h index ad31c1b04..c8e882743 100644 --- a/src/libstrongswan/library.h +++ b/src/libstrongswan/library.h @@ -80,7 +80,8 @@ # error config.h not included, pass "-include [...]/config.h" to gcc #endif -#include "printf_hook.h" +/* make sure we include printf_hook.h first */ +#include "utils/printf_hook.h" #include "utils.h" #include "chunk.h" #include "settings.h" diff --git a/src/libstrongswan/printf_hook.c b/src/libstrongswan/utils/printf_hook.c index 6e51aa4c3..6e51aa4c3 100644 --- a/src/libstrongswan/printf_hook.c +++ b/src/libstrongswan/utils/printf_hook.c diff --git a/src/libstrongswan/printf_hook.h b/src/libstrongswan/utils/printf_hook.h index 7d3f23bce..1425910be 100644 --- a/src/libstrongswan/printf_hook.h +++ b/src/libstrongswan/utils/printf_hook.h @@ -16,7 +16,7 @@ /** * @defgroup printf_hook printf_hook - * @{ @ingroup libstrongswan + * @{ @ingroup utils */ #ifndef PRINTF_HOOK_H_ |