some more cleanup

reduced dependencies, moved non-runtime files to its own directory except
for some whom's status is unclear

11 files changed, 25 insertions, 10 deletions

diff --git a/runtime/errmsg.c b/runtime/errmsg.c
index 42f84724..01d392b7 100644
--- a/runtime/errmsg.c
+++ b/runtime/errmsg.c
@@ -33,7 +33,7 @@
 #include <assert.h>
 
 #include "rsyslog.h"
-#include "syslogd.h"
+#include "dirty.h"
 #include "obj.h"
 #include "errmsg.h"
 #include "sysvar.h"
diff --git a/runtime/modules.c b/runtime/modules.c
index f10390c7..8ae9f038 100644
--- a/runtime/modules.c
+++ b/runtime/modules.c
@@ -49,7 +49,7 @@
 #include <unistd.h>
 #include <sys/file.h>
 
-#include "syslogd.h"
+#include "dirty.h"
 #include "cfsysline.h"
 #include "modules.h"
 #include "errmsg.h"
diff --git a/runtime/msg.c b/runtime/msg.c
index ed9cdbbb..e5ed19c6 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -36,7 +36,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include "rsyslog.h"
-#include "syslogd.h"
+#include "dirty.h"
 #include "srUtils.h"
 #include "stringbuf.h"
 #include "template.h"
diff --git a/runtime/msg.h b/runtime/msg.h
index 56ce56bb..9ec038dd 100644
--- a/runtime/msg.h
+++ b/runtime/msg.h
@@ -107,7 +107,6 @@ struct msg {
         char *pszTIMESTAMP_PgSQL;/* TIMESTAMP as PgSQL formatted string (always 21 characters) */
 	int msgFlags;		/* flags associated with this message */
 };
-typedef struct msg msg_t;	/* new name */
 
 /* function prototypes
  */
diff --git a/runtime/net.c b/runtime/net.c
index 84c286d2..70e7d6f6 100644
--- a/runtime/net.c
+++ b/runtime/net.c
@@ -55,7 +55,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "syslogd.h"
+#include "dirty.h"
 #include "syslogd-types.h"
 #include "module-template.h"
 #include "parse.h"
diff --git a/runtime/queue.c b/runtime/queue.c
index 0f58c545..11c073a0 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 
 #include "rsyslog.h"
-#include "syslogd.h"
+#include "dirty.h"
 #include "queue.h"
 #include "stringbuf.h"
 #include "srUtils.h"
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h
index 2dfc266b..5ec3a369 100644
--- a/runtime/rsyslog.h
+++ b/runtime/rsyslog.h
@@ -44,9 +44,25 @@
 #	define _FILE_OFFSET_BITS 64
 #endif
 
+/* portability: not all platforms have these defines, so we
+ * define them here if they are missing. -- rgerhards, 2008-03-04
+ */
+#ifndef LOG_MAKEPRI
+#	define	LOG_MAKEPRI(fac, pri)	(((fac) << 3) | (pri))
+#endif
+#ifndef LOG_PRI
+#	define	LOG_PRI(p)	((p) & LOG_PRIMASK)
+#endif
+#ifndef LOG_FAC
+#	define	LOG_FAC(p)	(((p) & LOG_FACMASK) >> 3)
+#endif
+
+
 /* define some base data types */
 typedef struct thrdInfo thrdInfo_t;
 typedef struct filed selector_t;	/* TODO: this so far resides in syslogd.c, think about modularization */
+typedef struct NetAddr netAddr_t;
+typedef struct msg msg_t;
 
 /* some universal 64 bit define... */
 typedef long long int64;
diff --git a/runtime/srutils.c b/runtime/srutils.c
index 93908767..f1208c26 100644
--- a/runtime/srutils.c
+++ b/runtime/srutils.c
@@ -44,7 +44,7 @@
 #define TRUE 1
 #define FALSE 0
 #include "srUtils.h"
-#include "syslogd.h"
+#include "dirty.h"
 #include "obj.h"
 
 
diff --git a/runtime/stream.c b/runtime/stream.c
index 1be4571a..7274b807 100644
--- a/runtime/stream.c
+++ b/runtime/stream.c
@@ -41,7 +41,7 @@
 #include <errno.h>
 
 #include "rsyslog.h"
-#include "syslogd.h"
+#include "dirty.h"
 #include "stringbuf.h"
 #include "srUtils.h"
 #include "obj.h"
diff --git a/runtime/wti.c b/runtime/wti.c
index 82cd2165..88439049 100644
--- a/runtime/wti.c
+++ b/runtime/wti.c
@@ -40,7 +40,7 @@
 #include <errno.h>
 
 #include "rsyslog.h"
-#include "syslogd.h"
+#include "dirty.h"
 #include "stringbuf.h"
 #include "srUtils.h"
 #include "wtp.h"
diff --git a/runtime/wtp.c b/runtime/wtp.c
index fcc7589c..98f1bdbe 100644
--- a/runtime/wtp.c
+++ b/runtime/wtp.c
@@ -41,7 +41,7 @@
 #include <errno.h>
 
 #include "rsyslog.h"
-#include "syslogd.h"
+#include "dirty.h"
 #include "stringbuf.h"
 #include "srUtils.h"
 #include "wtp.h"