Merge pull request #268 from jongough/updates_1.1

Fix warning message re redefinition of MIN & MAX
jongough · Jul 15, 2016 · 64ea0fb · 64ea0fb
2 parents 737b367 + ba3fe9f
commit 64ea0fb
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/ODJSON.cpp b/src/ODJSON.cpp
@@ -32,9 +32,11 @@
 #ifndef  WX_PRECOMP
 #include "wx/wx.h"
 #endif //precompiled headers
+#include <wx/jsonreader.h>
+#include "wx/jsonwriter.h"
 
-#include "ODJSON.h"
 #include "ocpn_draw_pi.h"
+#include "ODJSON.h"
 #include "ODPath.h"
 #include "PathMan.h"
 #include "Boundary.h"
@@ -46,9 +48,6 @@
 #include "PointMan.h"
 #include "version.h"
 
-#include <wx/jsonreader.h>
-#include "wx/jsonwriter.h"
-
 #include <stdio.h>
 
 extern PathMan              *g_pPathMan;