better split up of library files "types.h" & "definitions.h"

centralized all printf specifier character definitions
reuse of arginfo handlers
more cleanups
fixed more AMD64 issues
added DEBUG_LEVEL compile flag to exclude DBGn() statements

12 files changed, 12 insertions, 13 deletions

diff --git a/src/charon/queues/jobs/acquire_job.h b/src/charon/queues/jobs/acquire_job.h
index 5a59c38a2..54f1b9b5b 100644
--- a/src/charon/queues/jobs/acquire_job.h
+++ b/src/charon/queues/jobs/acquire_job.h
@@ -25,7 +25,7 @@
 
 typedef struct acquire_job_t acquire_job_t;
 
-#include <types.h>
+#include <library.h>
 #include <queues/jobs/job.h>
 
 /**
diff --git a/src/charon/queues/jobs/delete_child_sa_job.h b/src/charon/queues/jobs/delete_child_sa_job.h
index 99e042f7a..9c2e4fa4d 100644
--- a/src/charon/queues/jobs/delete_child_sa_job.h
+++ b/src/charon/queues/jobs/delete_child_sa_job.h
@@ -25,7 +25,7 @@
 
 typedef struct delete_child_sa_job_t delete_child_sa_job_t;
 
-#include <types.h>
+#include <library.h>
 #include <sa/ike_sa_id.h>
 #include <queues/jobs/job.h>
 #include <config/proposal.h>
diff --git a/src/charon/queues/jobs/delete_ike_sa_job.h b/src/charon/queues/jobs/delete_ike_sa_job.h
index 5857e9937..43701a354 100644
--- a/src/charon/queues/jobs/delete_ike_sa_job.h
+++ b/src/charon/queues/jobs/delete_ike_sa_job.h
@@ -26,7 +26,7 @@
 
 typedef struct delete_ike_sa_job_t delete_ike_sa_job_t;
 
-#include <types.h>
+#include <library.h>
 #include <sa/ike_sa_id.h>
 #include <queues/jobs/job.h>
 
diff --git a/src/charon/queues/jobs/incoming_packet_job.h b/src/charon/queues/jobs/incoming_packet_job.h
index 9228d2e7d..5ce0750f7 100644
--- a/src/charon/queues/jobs/incoming_packet_job.h
+++ b/src/charon/queues/jobs/incoming_packet_job.h
@@ -26,7 +26,7 @@
 
 typedef struct incoming_packet_job_t incoming_packet_job_t;
 
-#include <types.h>
+#include <library.h>
 #include <network/packet.h>
 #include <queues/jobs/job.h>
 
diff --git a/src/charon/queues/jobs/initiate_job.h b/src/charon/queues/jobs/initiate_job.h
index 677150508..846f2f62f 100644
--- a/src/charon/queues/jobs/initiate_job.h
+++ b/src/charon/queues/jobs/initiate_job.h
@@ -25,7 +25,7 @@
 
 typedef struct initiate_job_t initiate_job_t;
 
-#include <types.h>
+#include <library.h>
 #include <queues/jobs/job.h>
 #include <config/connections/connection.h>
 #include <config/policies/policy.h>
diff --git a/src/charon/queues/jobs/job.h b/src/charon/queues/jobs/job.h
index aa29797c0..ae3fe7974 100644
--- a/src/charon/queues/jobs/job.h
+++ b/src/charon/queues/jobs/job.h
@@ -27,8 +27,7 @@
 typedef enum job_type_t job_type_t;
 typedef struct job_t job_t;
 
-#include <types.h>
-#include <definitions.h>
+#include <library.h>
 
 /**
  * @brief Definition of the various job types.
diff --git a/src/charon/queues/jobs/rekey_child_sa_job.h b/src/charon/queues/jobs/rekey_child_sa_job.h
index 4aacf57c1..19e1b5d32 100644
--- a/src/charon/queues/jobs/rekey_child_sa_job.h
+++ b/src/charon/queues/jobs/rekey_child_sa_job.h
@@ -25,7 +25,7 @@
 
 typedef struct rekey_child_sa_job_t rekey_child_sa_job_t;
 
-#include <types.h>
+#include <library.h>
 #include <sa/ike_sa_id.h>
 #include <queues/jobs/job.h>
 #include <config/proposal.h>
diff --git a/src/charon/queues/jobs/rekey_ike_sa_job.h b/src/charon/queues/jobs/rekey_ike_sa_job.h
index b1fdb3303..4848369d3 100644
--- a/src/charon/queues/jobs/rekey_ike_sa_job.h
+++ b/src/charon/queues/jobs/rekey_ike_sa_job.h
@@ -25,7 +25,7 @@
 
 typedef struct rekey_ike_sa_job_t rekey_ike_sa_job_t;
 
-#include <types.h>
+#include <library.h>
 #include <sa/ike_sa_id.h>
 #include <queues/jobs/job.h>
 
diff --git a/src/charon/queues/jobs/retransmit_request_job.h b/src/charon/queues/jobs/retransmit_request_job.h
index c57a870ab..1897af16d 100644
--- a/src/charon/queues/jobs/retransmit_request_job.h
+++ b/src/charon/queues/jobs/retransmit_request_job.h
@@ -26,7 +26,7 @@
 
 typedef struct retransmit_request_job_t retransmit_request_job_t;
 
-#include <types.h>
+#include <library.h>
 #include <queues/jobs/job.h>
 #include <sa/ike_sa_id.h>
 
diff --git a/src/charon/queues/jobs/route_job.h b/src/charon/queues/jobs/route_job.h
index ad7b48b95..2743a70ab 100644
--- a/src/charon/queues/jobs/route_job.h
+++ b/src/charon/queues/jobs/route_job.h
@@ -24,7 +24,7 @@
 
 typedef struct route_job_t route_job_t;
 
-#include <types.h>
+#include <library.h>
 #include <queues/jobs/job.h>
 #include <config/policies/policy.h>
 #include <config/connections/connection.h>
diff --git a/src/charon/queues/jobs/send_dpd_job.h b/src/charon/queues/jobs/send_dpd_job.h
index fb1757471..f3900f9a2 100644
--- a/src/charon/queues/jobs/send_dpd_job.h
+++ b/src/charon/queues/jobs/send_dpd_job.h
@@ -24,7 +24,7 @@
 
 typedef struct send_dpd_job_t send_dpd_job_t;
 
-#include <types.h>
+#include <library.h>
 #include <queues/jobs/job.h>
 #include <config/connections/connection.h>
 #include <sa/ike_sa_id.h>
diff --git a/src/charon/queues/jobs/send_keepalive_job.h b/src/charon/queues/jobs/send_keepalive_job.h
index 1bb7afd7a..c7d05be65 100644
--- a/src/charon/queues/jobs/send_keepalive_job.h
+++ b/src/charon/queues/jobs/send_keepalive_job.h
@@ -24,7 +24,7 @@
 
 typedef struct send_keepalive_job_t send_keepalive_job_t;
 
-#include <types.h>
+#include <library.h>
 #include <queues/jobs/job.h>
 #include <config/connections/connection.h>
 #include <sa/ike_sa_id.h>