From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 13 May 2014 07:54:49 +0000 (+0200)
Subject: settings: Include generated header after others
X-Git-Tag: 5.2.0dr4~1^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=813e510d69b27ab25cfab01cc89dd34ad3927e73;p=thirdparty%2Fstrongswan.git

settings: Include generated header after others

Newer Bison versions declare the parser function in the header, which
requires custom types.
---

diff --git a/src/libstrongswan/settings/settings_lexer.l b/src/libstrongswan/settings/settings_lexer.l
index f287761c19..5074e70d88 100644
--- a/src/libstrongswan/settings/settings_lexer.l
+++ b/src/libstrongswan/settings/settings_lexer.l
@@ -14,10 +14,10 @@
  * for more details.
  */
 
-#include "settings_parser.h"
-
 #include <utils/parser_helper.h>
 
+#include "settings_parser.h"
+
 bool settings_parser_open_next_file(parser_helper_t *ctx);
 
 static void include_files(parser_helper_t *ctx);
diff --git a/src/libstrongswan/settings/settings_parser.y b/src/libstrongswan/settings/settings_parser.y
index d5566df9d9..f4a4431c72 100644
--- a/src/libstrongswan/settings/settings_parser.y
+++ b/src/libstrongswan/settings/settings_parser.y
@@ -17,13 +17,13 @@
 #define _GNU_SOURCE /* for asprintf() */
 #include <stdio.h>
 
-#include "settings_parser.h"
-
 #include <library.h>
 #include <collections/array.h>
 #include <settings/settings_types.h>
 #include <utils/parser_helper.h>
 
+#include "settings_parser.h"
+
 #define YYDEBUG 1
 
 /**