Merge branch 'v5-devel' & fix bug in BSD imklog driver

Conflicts:
	plugins/imklog/ksym.c
	plugins/imklog/linux.c

1 files changed, 0 insertions, 35 deletions

diff --git a/plugins/imklog/module.h b/plugins/imklog/module.h
deleted file mode 100644
index 38a26fea..00000000
--- a/plugins/imklog/module.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  module.h - Miscellaneous module definitions
- *  Copyright (c) 1996 Richard Henderson <rth@tamu.edu>
- *  Copyright (c) 2004-7 Martin Schulze <joey@infodrom.org>
- *  Copyright (c) 2007-2008 Rainer Gerhards <rgerhards@adiscon.com>
- *
- * This file is part of rsyslog.
- *
- * Rsyslog is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Rsyslog is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Rsyslog.  If not, see <http://www.gnu.org/licenses/>.
- *
- * A copy of the GPL can be found in the file "COPYING" in this distribution.
- */
-struct sym_table
-{
-        unsigned long value;
-        char *name;
-};
-
-struct Module
-{
-        struct sym_table *sym_array;
-        int num_syms;
-
-        char *name;
-};