Otherwise, ASSERT does not work.

diff --git a/css-lex.c b/css-lex.c
index 754c52674849200f444ed380a6b41536ef44ca3a..947588a768079f0d23a6ffc34d59e5c375ac8e83 100644 (file)
--- a/css-lex.c
+++ b/css-lex.c
@@ -4,14 +4,14 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/chartype.h>
 #include <ucw/fastbuf.h>
 #include <ucw/mempool.h>
 
 #include <fcntl.h>
 
-#include "leo.h"
 #include "style.h"
 #include "css.h"
 #include "css-parse.h"

diff --git a/css.c b/css.c
index bfff47d29aa3e34628c68a9a31376bf58c25e88f..2f754a44765e1d6e7be540f00f0574e54960aca1 100644 (file)
--- a/css.c
+++ b/css.c
@@ -4,12 +4,12 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/mempool.h>
 
 #include <stdio.h>
 
-#include "leo.h"
 #include "style.h"
 #include "css.h"
 

diff --git a/dict.c b/dict.c
index a3679e713c1425f1a890cc0a41664744e11a2086..ac9faedf242a4c5f63e17fd775c8d5e5a31aee9b 100644 (file)
--- a/dict.c
+++ b/dict.c
@@ -4,10 +4,10 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/mempool.h>
 
-#include "leo.h"
 #include "dict.h"
 
 struct kv_map {

diff --git a/fixed.c b/fixed.c
index 53acdf2a4cd1041845d9ceb42a2fcbf4a5411e58..a5ce9f6c24dfe924d16ca5e6a62b6861ba8d161e 100644 (file)
--- a/fixed.c
+++ b/fixed.c
@@ -4,12 +4,12 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/conf.h>
 
 #include <stdio.h>
 
-#include "leo.h"
 #include "osm.h"
 #include "fixed.h"
 

diff --git a/leo.c b/leo.c
index 1af53c0150819cd163c1a79a280aa3d5913e4c6b..5c25ff6205bafa6b9aeddfe4720fd97189b2f769 100644 (file)
--- a/leo.c
+++ b/leo.c
@@ -4,13 +4,13 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/conf.h>
 #include <ucw/opt.h>
 
 #include <stdio.h>
 
-#include "leo.h"
 #include "osm.h"
 #include "svg.h"
 #include "style.h"

diff --git a/leo.h b/leo.h
index f753065443776bfa89d2f6ee7dc22f50ad551992..225cc258e8e18d2bbafd241e3d5b784209223354 100644 (file)
--- a/leo.h
+++ b/leo.h
@@ -4,10 +4,11 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/clists.h>
-
 #include "autoconf.h"
 
+#include <ucw/lib.h>
+#include <ucw/clists.h>
+
 typedef u32 color_t;                   // 0x00RRGGBB
 
 #define COLOR_NONE 0xffffffff

diff --git a/map.c b/map.c
index fc377bcf45631790b56277463ec79000f9a8206a..366d17a77217ea787ccbc37706f76a8202bf2089 100644 (file)
--- a/map.c
+++ b/map.c
@@ -4,7 +4,8 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/conf.h>
 #include <ucw/gary.h>
 #include <ucw/mempool.h>
@@ -13,7 +14,6 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "leo.h"
 #include "osm.h"
 #include "shp.h"
 #include "map.h"

diff --git a/osm.c b/osm.c
index c21e0d9e9ab72e75cf38f6b1b88299c67a699d5a..784135882176faa33f925880dcd98815eac6eb23 100644 (file)
--- a/osm.c
+++ b/osm.c
@@ -4,7 +4,8 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/gary.h>
 #include <ucw/mempool.h>
 #include <ucw/stkstring.h>
@@ -16,7 +17,6 @@
 #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
 #include <proj_api.h>
 
-#include "leo.h"
 #include "osm.h"
 
 struct osm *osm_this;

diff --git a/shp.c b/shp.c
index 0e0ff54a0cdb6ada76e236a541ab6b2f2e077520..37530c880accf4451b2de086f61105546791c697 100644 (file)
--- a/shp.c
+++ b/shp.c
@@ -9,7 +9,8 @@
 
 #undef LOCAL_DEBUG
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/conf.h>
 #include <ucw/fastbuf.h>
 #include <ucw/gary.h>
@@ -18,7 +19,6 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include "leo.h"
 #include "osm.h"
 #include "map.h"
 #include "shp.h"

diff --git a/style.c b/style.c
index a77988d9dba72e4a575bb1981a1e8c812720485b..7c72534758284166351416bca61cc422852a2e11 100644 (file)
--- a/style.c
+++ b/style.c
@@ -4,12 +4,12 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/mempool.h>
 
 #include <stdio.h>
 
-#include "leo.h"
 #include "osm.h"
 #include "style.h"
 

diff --git a/svg-icon.c b/svg-icon.c
index 95ba4eb19ba620e7ec4b4f08bef029bf7ca876ca..e9bd4f75d0aeab618a6fee0276af226092cc24fc 100644 (file)
--- a/svg-icon.c
+++ b/svg-icon.c
@@ -4,7 +4,8 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/fastbuf.h>
 #include <ucw-xml/xml.h>
 
@@ -13,7 +14,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "leo.h"
 #include "svg.h"
 
 #define HASH_NODE struct svg_icon

diff --git a/svg.c b/svg.c
index 819014353509827840baea639d27500ed0c51f82..98a445291cfc0e7387b43fa207315cf97ec56dd8 100644 (file)
--- a/svg.c
+++ b/svg.c
@@ -4,7 +4,8 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/gary.h>
 #include <ucw/mempool.h>
 #include <ucw-xml/xml.h>
@@ -13,7 +14,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "leo.h"
 #include "svg.h"
 
 static void svg_start_tag(struct svg *svg, struct svg_element *e);

diff --git a/sym-line.c b/sym-line.c
index 4944fcdd987de884971fc0ed2e5cfd8def596851..09dcee4d73c7f8e7fc6c811d1b46a0ad913dfac3 100644 (file)
--- a/sym-line.c
+++ b/sym-line.c
@@ -4,14 +4,14 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/fastbuf.h>
 #include <ucw/mempool.h>
 
 #include <math.h>
 #include <stdio.h>
 
-#include "leo.h"
 #include "osm.h"
 #include "sym.h"
 

diff --git a/sym-point.c b/sym-point.c
index c7c2be0a01f8c470757ae9416c4dd387f2135e21..e95c0e1c2c341a19dd4ada4be1ec9f45638ab346 100644 (file)
--- a/sym-point.c
+++ b/sym-point.c
@@ -4,11 +4,10 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
 
 #include <stdio.h>
 
-#include "leo.h"
 #include "osm.h"
 #include "sym.h"
 #include "svg.h"

diff --git a/sym-text.c b/sym-text.c
index ffcfc421d78a516ddd446644ac0a86a312368d41..504f62f5fd6115b3171d781fc6cc36b4d1406e81 100644 (file)
--- a/sym-text.c
+++ b/sym-text.c
@@ -4,7 +4,8 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/stkstring.h>
 
 #include <math.h>
@@ -13,7 +14,6 @@
 #include FT_FREETYPE_H
 #include <pango/pangoft2.h>
 
-#include "leo.h"
 #include "osm.h"
 #include "sym.h"
 #include "map.h"

diff --git a/sym.c b/sym.c
index 00d89416b3e798d4ce3f16405e2d420847771aaa..8f28f078aaae5ab039b8cc166925827deac94d41 100644 (file)
--- a/sym.c
+++ b/sym.c
@@ -4,14 +4,14 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/gary.h>
 #include <ucw/mempool.h>
 #include <ucw/stkstring.h>
 
 #include <stdio.h>
 
-#include "leo.h"
 #include "osm.h"
 #include "style.h"
 #include "sym.h"

diff --git a/xml.c b/xml.c
index 69e739d06915121f8f34e95a73368e62dd219912..633c1b6f3cd8bc8c979b4c795197d7654ef9a87f 100644 (file)
--- a/xml.c
+++ b/xml.c
@@ -6,7 +6,8 @@
 
 #undef LOCAL_DEBUG
 
-#include <ucw/lib.h>
+#include "leo.h"
+
 #include <ucw/fastbuf.h>
 #include <ucw-xml/xml.h>
 
@@ -14,7 +15,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "leo.h"
 #include "osm.h"
 
 static void parse_tag(struct xml_context *ctx, struct osm_object *o, struct xml_node *t)