diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-11 22:56:30 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-11 22:56:30 -0400 |
| commit | fa89550518af96a8804749c0ab0916599a94c1da (patch) | |
| tree | 57db50190ad4bcdbc9ef54efc528db4286daedac /src/grp-journal/grp-remote/systemd-journal-gatewayd | |
| parent | f4b50a2aa19f5a99008565f4127952ea8f2e4f61 (diff) | |
Run the new fixup script.
The biggest change is that it keeps looking for new #include
blocks. This means that it (more) correctly handles #ifdef'd
#includes.
I'm not 100% in love with it, but it's pretty good for automated.
What I really don't like is it did some silly things with newlines
in typedef blocks. I've avoided committing those. I think it may
be possible to get it to do the right thing. But really, the
typedef blocks are a hack for poorly structured headers.
Now that it keeps looking for new #include blocks, I could strip
out the typedef support, and it would mostly work; but it wouldn't
be able to move some headers back to the top.
IDK what to do.
Diffstat (limited to 'src/grp-journal/grp-remote/systemd-journal-gatewayd')
| -rw-r--r-- | src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile index b3c2e450e5..d481db82dc 100644 --- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile +++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk ifneq ($(HAVE_MICROHTTPD),) diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c b/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c index 2e21f9ecb7..76b241a14b 100644 --- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c +++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c @@ -32,16 +32,16 @@ #include <systemd/sd-journal.h> #include "basic/alloc-util.h" -#include "shared/bus-util.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/hostname-util.h" #include "basic/log.h" -#include "shared/logs-show.h" -#include "microhttpd-util.h" #include "basic/parse-util.h" #include "basic/sigbus.h" #include "basic/util.h" +#include "microhttpd-util.h" +#include "shared/bus-util.h" +#include "shared/logs-show.h" #define JOURNAL_WAIT_TIMEOUT (10*USEC_PER_SEC) |