From 7e1b475d9eced1be0d4c500418cb44d7ae9ffa8c Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Mon, 8 Jun 2015 11:29:11 +0200 Subject: [PATCH] Changed order of includes "leo.h" must come first, because depends on our "autoconf.h" (for example, DEBUG_ASSERTS). --- TODO | 4 ++++ css-lex.c | 13 ++++++------- css.c | 9 ++++----- dict.c | 5 ++--- fixed.c | 9 ++++----- leo.c | 11 +++++------ leo.h | 7 ++++--- map.c | 17 ++++++++--------- osm.c | 7 +++---- shp.c | 11 +++++------ style.c | 9 ++++----- svg-icon.c | 7 +++---- svg.c | 7 +++---- sym-line.c | 9 ++++----- sym-point.c | 6 ++---- sym-scale.c | 2 -- sym-text.c | 11 +++++------ sym.c | 11 +++++------ xml.c | 7 +++---- 19 files changed, 74 insertions(+), 88 deletions(-) diff --git a/TODO b/TODO index 98be6bb..d5d0a44 100644 --- 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 daad578..1a287f2 100644 --- 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 */ -#include +#include "leo.h" +#include "style.h" +#include "css.h" +#include "css-parse.h" + #include #include #include #include -#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 bfff47d..38464aa 100644 --- a/css.c +++ b/css.c @@ -4,15 +4,14 @@ * (c) 2014 Martin Mares */ -#include -#include - -#include - #include "leo.h" #include "style.h" #include "css.h" +#include + +#include + void css_dump(struct css_sheet *ss) { printf("Style sheet <%s>:\n", ss->filename); diff --git a/dict.c b/dict.c index 4542322..072b0a9 100644 --- a/dict.c +++ b/dict.c @@ -4,12 +4,11 @@ * (c) 2014--2015 Martin Mares */ -#include -#include - #include "leo.h" #include "dict.h" +#include + struct kv_map { u32 id; char *name; diff --git a/fixed.c b/fixed.c index 53acdf2..fc758bc 100644 --- a/fixed.c +++ b/fixed.c @@ -4,15 +4,14 @@ * (c) 2014 Martin Mares */ -#include -#include - -#include - #include "leo.h" #include "osm.h" #include "fixed.h" +#include + +#include + struct fixed_tag { cnode n; char *key, *val; diff --git a/leo.c b/leo.c index f8859e6..a221a94 100644 --- a/leo.c +++ b/leo.c @@ -4,12 +4,6 @@ * (c) 2014--2015 Martin Mares */ -#include -#include -#include - -#include - #include "leo.h" #include "osm.h" #include "svg.h" @@ -18,6 +12,11 @@ #include "sym.h" #include "map.h" +#include +#include + +#include + 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 f753065..77c198e 100644 --- a/leo.h +++ b/leo.h @@ -1,13 +1,14 @@ /* * Hic Est Leo * - * (c) 2014 Martin Mares + * (c) 2014--2015 Martin Mares */ -#include - #include "autoconf.h" +#include +#include + typedef u32 color_t; // 0x00RRGGBB #define COLOR_NONE 0xffffffff diff --git a/map.c b/map.c index af586c4..41bf483 100644 --- a/map.c +++ b/map.c @@ -4,15 +4,6 @@ * (c) 2014--2015 Martin Mares */ -#include -#include -#include -#include -#include - -#include -#include - #include "leo.h" #include "osm.h" #include "shp.h" @@ -21,6 +12,14 @@ #include "sym.h" #include "fixed.h" +#include +#include +#include +#include + +#include +#include + 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 a9c499e..2ae1281 100644 --- a/osm.c +++ b/osm.c @@ -4,7 +4,9 @@ * (c) 2014 Martin Mares */ -#include +#include "leo.h" +#include "osm.h" + #include #include #include @@ -14,9 +16,6 @@ #include #include -#include "leo.h" -#include "osm.h" - struct osm *osm_this; /*** Generic objects ***/ diff --git a/shp.c b/shp.c index 34f9b32..e70b197 100644 --- a/shp.c +++ b/shp.c @@ -9,7 +9,11 @@ #undef LOCAL_DEBUG -#include +#include "leo.h" +#include "osm.h" +#include "map.h" +#include "shp.h" + #include #include #include @@ -18,11 +22,6 @@ #include #include -#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 d8fd4c5..7c203ad 100644 --- a/style.c +++ b/style.c @@ -4,15 +4,14 @@ * (c) 2014 Martin Mares */ -#include -#include - -#include - #include "leo.h" #include "osm.h" #include "style.h" +#include + +#include + 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 95ba4eb..3596086 100644 --- a/svg-icon.c +++ b/svg-icon.c @@ -4,7 +4,9 @@ * (c) 2014 Martin Mares */ -#include +#include "leo.h" +#include "svg.h" + #include #include @@ -13,9 +15,6 @@ #include #include -#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 8190143..c1dec16 100644 --- a/svg.c +++ b/svg.c @@ -4,7 +4,9 @@ * (c) 2014 Martin Mares */ -#include +#include "leo.h" +#include "svg.h" + #include #include #include @@ -13,9 +15,6 @@ #include #include -#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 4944fcd..b741330 100644 --- a/sym-line.c +++ b/sym-line.c @@ -4,17 +4,16 @@ * (c) 2014 Martin Mares */ -#include +#include "leo.h" +#include "osm.h" +#include "sym.h" + #include #include #include #include -#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 c7c2be0..5383645 100644 --- a/sym-point.c +++ b/sym-point.c @@ -4,15 +4,13 @@ * (c) 2014 Martin Mares */ -#include - -#include - #include "leo.h" #include "osm.h" #include "sym.h" #include "svg.h" +#include + 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 64b3233..3a8185e 100644 --- a/sym-scale.c +++ b/sym-scale.c @@ -4,8 +4,6 @@ * (c) 2014--2015 Martin Mares */ -#include - #include "leo.h" #include "osm.h" #include "map.h" diff --git a/sym-text.c b/sym-text.c index ffcfc42..9861c59 100644 --- a/sym-text.c +++ b/sym-text.c @@ -4,7 +4,11 @@ * (c) 2014 Martin Mares */ -#include +#include "leo.h" +#include "osm.h" +#include "sym.h" +#include "map.h" + #include #include @@ -13,11 +17,6 @@ #include FT_FREETYPE_H #include -#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 6a14364..a98d0ba 100644 --- a/sym.c +++ b/sym.c @@ -4,18 +4,17 @@ * (c) 2014--2015 Martin Mares */ -#include +#include "leo.h" +#include "osm.h" +#include "style.h" +#include "sym.h" + #include #include #include #include -#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 04c8948..b4fbeb9 100644 --- a/xml.c +++ b/xml.c @@ -6,7 +6,9 @@ #undef LOCAL_DEBUG -#include +#include "leo.h" +#include "osm.h" + #include #include @@ -14,9 +16,6 @@ #include #include -#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"); -- 2.39.2