From be94bd0dd55ad711982ef64263799b009ff87199 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Mon, 27 Oct 2014 09:52:25 -0700 Subject: [PATCH] Remove an unused field from the index structure --- Makefile | 6 ++++-- tile.h | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 40c3a5d..e024f1e 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,8 @@ vector_tile.pb.cc vector_tile.pb.h: vector_tile.proto PG= +H = $(shell find . '(' -name '*.h' -o -name '*.hh' ')') + tippecanoe: geojson.o jsonpull.o vector_tile.pb.o tile.o clip.o pool.o mbtiles.o geometry.o projection.o g++ $(PG) -O3 -g -Wall -o $@ $^ -lm -lz -lprotobuf-lite -lsqlite3 @@ -23,10 +25,10 @@ libjsonpull.a: jsonpull.o ar rc $@ $^ ranlib $@ -%.o: %.c +%.o: %.c $(H) cc $(PG) -O3 -g -Wall -c $< -%.o: %.cc +%.o: %.cc $(H) g++ $(PG) -O3 -g -Wall -c $< clean: diff --git a/tile.h b/tile.h index 8190361..cb4a5be 100644 --- a/tile.h +++ b/tile.h @@ -20,8 +20,6 @@ struct pool_val *deserialize_string(char **f, struct pool *p, int type); struct index { unsigned long long index; long long fpos; - - struct index *next; }; long long write_tile(struct index *start, struct index *end, char *metabase, unsigned *file_bbox, int z, unsigned x, unsigned y, int detail, int basezoom, struct pool *file_keys, char *layername, sqlite3 *outdb, double droprate);