From a812a8816c350261ab1ed6a2583fa4ec09b1eb4d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 16 Jul 2014 07:49:21 -0400
Subject: [PATCH] journal-remote: fix double typedef and add missing header

---
 src/journal-remote/journal-remote-write.c |  1 -
 src/journal-remote/journal-remote.h       | 34 ++++++++++++++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c
index bec4cb1f7..8ede950be 100644
--- a/src/journal-remote/journal-remote-write.c
+++ b/src/journal-remote/journal-remote-write.c
@@ -20,7 +20,6 @@
 ***/
 
 #include "journal-remote.h"
-#include "journal-remote-write.h"
 
 int iovw_put(struct iovec_wrapper *iovw, void* data, size_t len) {
         if (!GREEDY_REALLOC(iovw->iovec, iovw->size_bytes, iovw->count + 1))
diff --git a/src/journal-remote/journal-remote.h b/src/journal-remote/journal-remote.h
index 0422cea08..1cf22f638 100644
--- a/src/journal-remote/journal-remote.h
+++ b/src/journal-remote/journal-remote.h
@@ -1,3 +1,26 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2014 Zbigniew Jędrzejewski-Szmek
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#pragma once
+
 #include <inttypes.h>
 
 #include "sd-event.h"
@@ -5,15 +28,18 @@
 #include "microhttpd-util.h"
 
 #include "journal-remote-parse.h"
+#include "journal-remote-write.h"
+
+typedef struct MHDDaemonWrapper MHDDaemonWrapper;
 
-typedef struct MHDDaemonWrapper {
+struct MHDDaemonWrapper {
         uint64_t fd;
         struct MHD_Daemon *daemon;
 
         sd_event_source *event;
-} MHDDaemonWrapper;
+};
 
-typedef struct RemoteServer {
+struct RemoteServer {
         RemoteSource **sources;
         size_t sources_size;
         size_t active;
@@ -27,4 +53,4 @@ typedef struct RemoteServer {
 
         bool check_trust;
         Hashmap *daemons;
-} RemoteServer;
+};
-- 
2.30.2