From b4324339f0266a02c964bc8187af28d1ed2511c0 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Mon, 14 Mar 2022 15:39:00 +0100
Subject: [PATCH] Otherwise, ASSERT does not work.

---
 css-lex.c   | 4 ++--
 css.c       | 4 ++--
 dict.c      | 4 ++--
 fixed.c     | 4 ++--
 leo.c       | 4 ++--
 leo.h       | 5 +++--
 map.c       | 4 ++--
 osm.c       | 4 ++--
 shp.c       | 4 ++--
 style.c     | 4 ++--
 svg-icon.c  | 4 ++--
 svg.c       | 4 ++--
 sym-line.c  | 4 ++--
 sym-point.c | 3 +--
 sym-text.c  | 4 ++--
 sym.c       | 4 ++--
 xml.c       | 4 ++--
 17 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/css-lex.c b/css-lex.c
index 754c526..947588a 100644
--- 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 bfff47d..2f754a4 100644
--- 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 a3679e7..ac9faed 100644
--- 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 53acdf2..a5ce9f6 100644
--- 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 1af53c0..5c25ff6 100644
--- 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 f753065..225cc25 100644
--- 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 fc377bc..366d17a 100644
--- 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 c21e0d9..7841358 100644
--- 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 0e0ff54..37530c8 100644
--- 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 a77988d..7c72534 100644
--- 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 95ba4eb..e9bd4f7 100644
--- 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 8190143..98a4452 100644
--- 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 4944fcd..09dcee4 100644
--- 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 c7c2be0..e95c0e1 100644
--- 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 ffcfc42..504f62f 100644
--- 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 00d8941..8f28f07 100644
--- 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 69e739d..633c1b6 100644
--- 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)
-- 
2.39.2