Changed order of includes

"leo.h" must come first, because <ucw/lib.h> depends on our
"autoconf.h" (for example, DEBUG_ASSERTS).

diff --git a/TODO b/TODO
index 98be6bbce8c9a451f953dd99bfd73345baccaa5e..d5d0a44b59fd1b8dc15f3272dc8b54c719c31640 100644 (file)
--- a/TODO
+++ b/TODO
@@ -10,3 +10,7 @@
   - icon-offset-{x,y} (commit c766658cd89232da2238aceeebcd4b3cc1b1a8c8)
   - (major-)z-index-fixup (commit 65930752a89084c4f17440a9fdc5548801134638)
   - casing-z-index (commit 65ad3116fc4ff85fdf8c2945f37d1d97cfe86c34)
+
+* Merge of labelling
+
+  - fix order of includes

diff --git a/css-lex.c b/css-lex.c
index daad578e77236971be858d785f08c9f77151dc7c..1a287f247b48120738bbc5447b3d690faf03fae3 100644 (file)
--- a/css-lex.c
+++ b/css-lex.c
@@ -1,21 +1,20 @@
 /*
- *     Experimenta lMai Renderer -- MapCSS Lexer
+ *     Experimental Map Renderer -- MapCSS Lexer
  *
  *     (c) 2014--2015 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+#include "style.h"
+#include "css.h"
+#include "css-parse.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"
-
 static struct fastbuf *fb;
 static struct fastbuf fbbuf;
 static int lino;

diff --git a/css.c b/css.c
index bfff47d29aa3e34628c68a9a31376bf58c25e88f..38464aaa6fca475145736939c8914060d0730832 100644 (file)
--- a/css.c
+++ b/css.c
@@ -4,15 +4,14 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
-#include <ucw/mempool.h>
-
-#include <stdio.h>
-
 #include "leo.h"
 #include "style.h"
 #include "css.h"
 
+#include <ucw/mempool.h>
+
+#include <stdio.h>
+
 void css_dump(struct css_sheet *ss)
 {
   printf("Style sheet <%s>:\n", ss->filename);

diff --git a/dict.c b/dict.c
index 4542322a2ac72d47ec3cf6cf455a644a27d0fe62..072b0a9445864b892ed00f843aeebb4784065704 100644 (file)
--- a/dict.c
+++ b/dict.c
@@ -4,12 +4,11 @@
  *     (c) 2014--2015 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
-#include <ucw/mempool.h>
-
 #include "leo.h"
 #include "dict.h"
 
+#include <ucw/mempool.h>
+
 struct kv_map {
   u32 id;
   char *name;

diff --git a/fixed.c b/fixed.c
index 53acdf2a4cd1041845d9ceb42a2fcbf4a5411e58..fc758bc87217aded8130fa4859c92113a0114133 100644 (file)
--- a/fixed.c
+++ b/fixed.c
@@ -4,15 +4,14 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
-#include <ucw/conf.h>
-
-#include <stdio.h>
-
 #include "leo.h"
 #include "osm.h"
 #include "fixed.h"
 
+#include <ucw/conf.h>
+
+#include <stdio.h>
+
 struct fixed_tag {
   cnode n;
   char *key, *val;

diff --git a/leo.c b/leo.c
index f8859e688c27999d8283b9880392c52e7fe0fa38..a221a941b6f86b3c6f7a2cff0dc0eaa59cee7a90 100644 (file)
--- a/leo.c
+++ b/leo.c
@@ -4,12 +4,6 @@
  *     (c) 2014--2015 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
-#include <ucw/conf.h>
-#include <ucw/opt.h>
-
-#include <stdio.h>
-
 #include "leo.h"
 #include "osm.h"
 #include "svg.h"
@@ -18,6 +12,11 @@
 #include "sym.h"
 #include "map.h"
 
+#include <ucw/conf.h>
+#include <ucw/opt.h>
+
+#include <stdio.h>
+
 uns debug_dump_source, debug_dump_after_proj, debug_dump_after_scaling;
 uns debug_dump_multipolygons, debug_dump_css, debug_dump_styling, debug_dump_symbols;
 

diff --git a/leo.h b/leo.h
index f753065443776bfa89d2f6ee7dc22f50ad551992..77c198e368a47594d84398b68f45184bc0201a13 100644 (file)
--- a/leo.h
+++ b/leo.h
@@ -1,13 +1,14 @@
 /*
  *     Hic Est Leo
  *
- *     (c) 2014 Martin Mares <mj@ucw.cz>
+ *     (c) 2014--2015 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 af586c46b15bf8e86bc3de5914c96bed2d5b344e..41bf483eeeddb7f2149f761c719470c4287b2c32 100644 (file)
--- a/map.c
+++ b/map.c
@@ -4,15 +4,6 @@
  *     (c) 2014--2015 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
-#include <ucw/conf.h>
-#include <ucw/gary.h>
-#include <ucw/mempool.h>
-#include <ucw/simple-lists.h>
-
-#include <stdio.h>
-#include <math.h>
-
 #include "leo.h"
 #include "osm.h"
 #include "shp.h"
@@ -21,6 +12,14 @@
 #include "sym.h"
 #include "fixed.h"
 
+#include <ucw/conf.h>
+#include <ucw/gary.h>
+#include <ucw/mempool.h>
+#include <ucw/simple-lists.h>
+
+#include <stdio.h>
+#include <math.h>
+
 double map_min_x, map_min_y;
 double map_max_x, map_max_y;
 double page_width, page_height;

diff --git a/osm.c b/osm.c
index a9c499e69152183d7d2545162a770f9f15535d59..2ae1281de3de681d08e086ff5e2ffa99d844e26a 100644 (file)
--- a/osm.c
+++ b/osm.c
@@ -4,7 +4,9 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+#include "osm.h"
+
 #include <ucw/gary.h>
 #include <ucw/mempool.h>
 #include <ucw/stkstring.h>
@@ -14,9 +16,6 @@
 #include <stdio.h>
 #include <proj_api.h>
 
-#include "leo.h"
-#include "osm.h"
-
 struct osm *osm_this;
 
 /*** Generic objects ***/

diff --git a/shp.c b/shp.c
index 34f9b321721943aba6e3565842d491cffa37eb42..e70b1976c4fe48e4c79222b3ccaf0f4ed644cae4 100644 (file)
--- a/shp.c
+++ b/shp.c
@@ -9,7 +9,11 @@
 
 #undef LOCAL_DEBUG
 
-#include <ucw/lib.h>
+#include "leo.h"
+#include "osm.h"
+#include "map.h"
+#include "shp.h"
+
 #include <ucw/conf.h>
 #include <ucw/fastbuf.h>
 #include <ucw/gary.h>
@@ -18,11 +22,6 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include "leo.h"
-#include "osm.h"
-#include "map.h"
-#include "shp.h"
-
 static osm_id_t shp_id_counter;
 
 static double shp_get_double(byte *p)

diff --git a/style.c b/style.c
index d8fd4c5bce2aefb5b0fea3018d06ecea73688a87..7c203ad902ce960315b97f809072e7f1d53eda26 100644 (file)
--- a/style.c
+++ b/style.c
@@ -4,15 +4,14 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
-#include <ucw/mempool.h>
-
-#include <stdio.h>
-
 #include "leo.h"
 #include "osm.h"
 #include "style.h"
 
+#include <ucw/mempool.h>
+
+#include <stdio.h>
+
 struct dict style_prop_dict, style_layer_dict;
 
 static const char * const style_wk_props[] = {

diff --git a/svg-icon.c b/svg-icon.c
index 95ba4eb19ba620e7ec4b4f08bef029bf7ca876ca..3596086d48548c976916bc6eb2ea70a9150ca6c9 100644 (file)
--- a/svg-icon.c
+++ b/svg-icon.c
@@ -4,7 +4,9 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+#include "svg.h"
+
 #include <ucw/fastbuf.h>
 #include <ucw-xml/xml.h>
 
@@ -13,9 +15,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "leo.h"
-#include "svg.h"
-
 #define HASH_NODE struct svg_icon
 #define HASH_PREFIX(x) icon_##x
 #define HASH_KEY_ENDSTRING name

diff --git a/svg.c b/svg.c
index 819014353509827840baea639d27500ed0c51f82..c1dec1631bdb2d8e4f2d8761d29bcad51f039c06 100644 (file)
--- a/svg.c
+++ b/svg.c
@@ -4,7 +4,9 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+#include "svg.h"
+
 #include <ucw/gary.h>
 #include <ucw/mempool.h>
 #include <ucw-xml/xml.h>
@@ -13,9 +15,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);
 static void svg_escape_string(struct svg *svg, const char *str);
 

diff --git a/sym-line.c b/sym-line.c
index 4944fcdd987de884971fc0ed2e5cfd8def596851..b7413303970724f129f571891065118b919472e2 100644 (file)
--- a/sym-line.c
+++ b/sym-line.c
@@ -4,17 +4,16 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+#include "osm.h"
+#include "sym.h"
+
 #include <ucw/fastbuf.h>
 #include <ucw/mempool.h>
 
 #include <math.h>
 #include <stdio.h>
 
-#include "leo.h"
-#include "osm.h"
-#include "sym.h"
-
 static void sym_line_attrs(struct sym_line *l, struct svg *svg)
 {
   svg_set_attr(svg, "fill", "none");

diff --git a/sym-point.c b/sym-point.c
index c7c2be0a01f8c470757ae9416c4dd387f2135e21..53836452940a582eedc045c7cb4c2677eed16253 100644 (file)
--- a/sym-point.c
+++ b/sym-point.c
@@ -4,15 +4,13 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
-
-#include <stdio.h>
-
 #include "leo.h"
 #include "osm.h"
 #include "sym.h"
 #include "svg.h"
 
+#include <stdio.h>
+
 static void sym_point_draw(struct symbol *sym, struct svg *svg)
 {
   struct sym_point *p = (struct sym_point *) sym;

diff --git a/sym-scale.c b/sym-scale.c
index 64b3233b90be3a21fe1b6a84b39a007ab0c7c640..3a8185e7e7f41d04ddeb2b52779a5fd0de1fc1d0 100644 (file)
--- a/sym-scale.c
+++ b/sym-scale.c
@@ -4,8 +4,6 @@
  *     (c) 2014--2015 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
-
 #include "leo.h"
 #include "osm.h"
 #include "map.h"

diff --git a/sym-text.c b/sym-text.c
index ffcfc421d78a516ddd446644ac0a86a312368d41..9861c596720af6612e7ed839e4924dd1b148f00d 100644 (file)
--- a/sym-text.c
+++ b/sym-text.c
@@ -4,7 +4,11 @@
  *     (c) 2014 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+#include "osm.h"
+#include "sym.h"
+#include "map.h"
+
 #include <ucw/stkstring.h>
 
 #include <math.h>
@@ -13,11 +17,6 @@
 #include FT_FREETYPE_H
 #include <pango/pangoft2.h>
 
-#include "leo.h"
-#include "osm.h"
-#include "sym.h"
-#include "map.h"
-
 /*** Fonts ***/
 
 struct text_font {

diff --git a/sym.c b/sym.c
index 6a1436437dd4c96961b6db48ce234635d89548c0..a98d0ba0c809fc31e67c5a234136d30490f11e2f 100644 (file)
--- a/sym.c
+++ b/sym.c
@@ -4,18 +4,17 @@
  *     (c) 2014--2015 Martin Mares <mj@ucw.cz>
  */
 
-#include <ucw/lib.h>
+#include "leo.h"
+#include "osm.h"
+#include "style.h"
+#include "sym.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"
-
 #undef CLAMP           // FIXME: Fix in libucw?
 #define CLAMP(x,min,max) ({ typeof(x) _t=x; (_t < min) ? min : (_t > max) ? max : _t; })       /** Clip a number @x to interval [@min,@max] **/
 

diff --git a/xml.c b/xml.c
index 04c89481899cb887c156fe5858f5af4072a32ef2..b4fbeb937dbdfa86848c864d1fc448717ccac8f2 100644 (file)
--- a/xml.c
+++ b/xml.c
@@ -6,7 +6,9 @@
 
 #undef LOCAL_DEBUG
 
-#include <ucw/lib.h>
+#include "leo.h"
+#include "osm.h"
+
 #include <ucw/fastbuf.h>
 #include <ucw-xml/xml.h>
 
@@ -14,9 +16,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)
 {
   char *tag_k = xml_attr_value(ctx, t, "k");