Merge remote branch 'upstream/master'

1 files changed, 36 insertions, 0 deletions

diff --git a/plugins/imjournal/imjournal.h b/plugins/imjournal/imjournal.h
new file mode 100644
index 00000000..8d2c1a09
--- /dev/null
+++ b/plugins/imjournal/imjournal.h
@@ -0,0 +1,36 @@
+/* imjournal.h
+ * These are the definitions for the journal messages import module
+ *
+ * Copyright 2007-2012 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *       -or-
+ *       see COPYING.ASL20 in the source distribution
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef	IMJOURNAL_H_INCLUDED
+#define	IMJOURNAL_H_INCLUDED 1
+
+#include "rsyslog.h"
+#include "dirty.h"
+#include <systemd/sd-journal.h>
+
+struct modConfData_s {
+};
+
+rsRetVal Syslog(int priority, uchar *msg, struct timeval *tp, struct json_object *json);
+
+#endif /* #ifndef IMJOURNAL_H_INCLUDED */
+/* vi:set ai:
+ */