summaryrefslogtreecommitdiffstats
path: root/runtime/conf.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-03-05 11:10:43 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-03-05 11:10:43 +0100
commit2e388db9ac91eae35ac836b329c8bcadd319a409 (patch)
tree1ecfb38d83a1cc1d9a6b1d3ad1c4b45fdc0cc755 /runtime/conf.c
parent42db7de5968d2db0fa855a9f029f6bccc0a30650 (diff)
downloadrsyslog-2e388db9ac91eae35ac836b329c8bcadd319a409.tar.gz
rsyslog-2e388db9ac91eae35ac836b329c8bcadd319a409.tar.xz
rsyslog-2e388db9ac91eae35ac836b329c8bcadd319a409.zip
integrated various patches for solaris
Unfortunatley, I do not have the full list of contributors available. The patch set was compiled by Ben Taylor, and I made some further changes to adopt it to the news rsyslog branch. Others provided much of the base work, but I can not find the names of the original authors. If you happen to be one of them, please let me know so that I can give proper credits.
Diffstat (limited to 'runtime/conf.c')
-rw-r--r--runtime/conf.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/runtime/conf.c b/runtime/conf.c
index c5208d86..a670c65b 100644
--- a/runtime/conf.c
+++ b/runtime/conf.c
@@ -46,7 +46,9 @@
#include <glob.h>
#include <sys/types.h>
#ifdef HAVE_LIBGEN_H
-# include <libgen.h>
+# ifndef OS_SOLARIS
+# include <libgen.h>
+# endif
#endif
#include "rsyslog.h"
@@ -68,6 +70,9 @@
#include "ctok.h"
#include "ctok_token.h"
+#ifdef OS_SOLARIS
+# define NAME_MAX MAXNAMELEN
+#endif
/* forward definitions */
static rsRetVal cfline(uchar *line, selector_t **pfCurr);