summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2019-12-20 11:06:00 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2019-12-20 11:06:00 +0000
commitd88886097f04fc407046db4032008ca30734c045 (patch)
treec747b49e50e6a5159cc017612a8b4aa673c140d4
parentModernize build (diff)
downloadlibjsonpp-d88886097f04fc407046db4032008ca30734c045.tar.bz2
libjsonpp-d88886097f04fc407046db4032008ca30734c045.tar.xz
libjsonpp-d88886097f04fc407046db4032008ca30734c045.zip
Move include to make header correct on its own
-rw-r--r--libjsonpp/jsonFlexLexer.cpp1
-rw-r--r--libjsonpp/jsonFlexLexer.h3
-rw-r--r--libjsonpp/parse.cpp1
3 files changed, 3 insertions, 2 deletions
diff --git a/libjsonpp/jsonFlexLexer.cpp b/libjsonpp/jsonFlexLexer.cpp
index e4019be..54c3d21 100644
--- a/libjsonpp/jsonFlexLexer.cpp
+++ b/libjsonpp/jsonFlexLexer.cpp
@@ -1,4 +1,3 @@
-#include <FlexLexer.h>
#include "jsonFlexLexer.h"
#include <glibmm/convert.h>
diff --git a/libjsonpp/jsonFlexLexer.h b/libjsonpp/jsonFlexLexer.h
index f17fdfc..23f2562 100644
--- a/libjsonpp/jsonFlexLexer.h
+++ b/libjsonpp/jsonFlexLexer.h
@@ -5,6 +5,9 @@
#include "jsonpp.h"
#include <stack>
#include <functional>
+#ifndef FLEX_SCANNER
+#include <FlexLexer.h>
+#endif
namespace json {
class jsonFlexLexer : public yyFlexLexer {
diff --git a/libjsonpp/parse.cpp b/libjsonpp/parse.cpp
index 9dc27fa..9c9a013 100644
--- a/libjsonpp/parse.cpp
+++ b/libjsonpp/parse.cpp
@@ -1,5 +1,4 @@
#include "jsonpp.h"
-#include <FlexLexer.h>
#include "jsonFlexLexer.h"
namespace json {