diff options
| author | Martin Willi <martin@revosec.ch> | 2015-04-15 17:03:47 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2015-04-16 14:50:41 +0200 |
| commit | 80e05dc8fd3e54363bf2cebb1f1ba8a89a6813c2 (patch) | |
| tree | 4b51d4eb2d831c56824dad76e68ff8ad8b3233d2 | |
| parent | 04f12ecd296287f433405078c520d5cbf073fcd9 (diff) | |
| download | strongswan-80e05dc8fd3e54363bf2cebb1f1ba8a89a6813c2.tar.bz2 strongswan-80e05dc8fd3e54363bf2cebb1f1ba8a89a6813c2.tar.xz | |
utils: Clean up includes
| -rw-r--r-- | src/libstrongswan/utils/utils.c | 13 | ||||
| -rw-r--r-- | src/libstrongswan/utils/utils.h | 54 |
2 files changed, 31 insertions, 36 deletions
diff --git a/src/libstrongswan/utils/utils.c b/src/libstrongswan/utils/utils.c index e3a16c0f0..9b516accd 100644 --- a/src/libstrongswan/utils/utils.c +++ b/src/libstrongswan/utils/utils.c @@ -16,25 +16,20 @@ #include "utils.h" -#include <string.h> -#include <stdio.h> #include <unistd.h> -#include <inttypes.h> -#include <stdint.h> -#include <dirent.h> -#include <time.h> +#include <limits.h> #ifndef WIN32 # include <signal.h> #endif #include <library.h> -#include <utils/chunk.h> #include <collections/enumerator.h> -#include <threading/mutex.h> -#include <threading/condvar.h> #ifdef WIN32 +#include <threading/mutex.h> +#include <threading/condvar.h> + /** * Flag to indicate signaled wait_sigint() */ diff --git a/src/libstrongswan/utils/utils.h b/src/libstrongswan/utils/utils.h index 87d069515..acc15c42a 100644 --- a/src/libstrongswan/utils/utils.h +++ b/src/libstrongswan/utils/utils.h @@ -40,6 +40,33 @@ # include <poll.h> #endif +#include "utils/types.h" +#include "enum.h" +#include "utils/atomics.h" +#include "utils/align.h" +#include "utils/byteorder.h" +#include "utils/string.h" +#include "utils/memory.h" +#include "utils/strerror.h" +#include "utils/status.h" +#include "utils/object.h" +#include "utils/path.h" +#include "utils/time.h" +#include "utils/tty.h" +#ifdef __APPLE__ +# include "compat/apple.h" +#endif + +/** + * Initialize utility functions + */ +void utils_init(); + +/** + * Deinitialize utility functions + */ +void utils_deinit(); + /** * strongSwan program return codes */ @@ -74,33 +101,6 @@ #define BUILD_ASSERT_ARRAY(a) \ BUILD_ASSERT(!__builtin_types_compatible_p(typeof(a), typeof(&(a)[0]))) -#include "utils/types.h" -#include "enum.h" -#include "utils/atomics.h" -#include "utils/align.h" -#include "utils/byteorder.h" -#include "utils/string.h" -#include "utils/memory.h" -#include "utils/strerror.h" -#include "utils/status.h" -#include "utils/object.h" -#include "utils/path.h" -#include "utils/time.h" -#include "utils/tty.h" -#ifdef __APPLE__ -# include "compat/apple.h" -#endif - -/** - * Initialize utility functions - */ -void utils_init(); - -/** - * Deinitialize utility functions - */ -void utils_deinit(); - /** * Debug macro to follow control flow */ |