From e4e14b207801027a4736decbdade446d8adaa2c4 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Mon, 19 Oct 2015 15:43:06 -0700 Subject: [PATCH] Link with -lpthread --- Makefile | 2 +- tile.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c9e0d02..0ffc05f 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ INCLUDES = -I/usr/local/include LIBS = -L/usr/local/lib tippecanoe: geojson.o jsonpull.o vector_tile.pb.o tile.o clip.o pool.o mbtiles.o geometry.o projection.o memfile.o clipper/clipper.o - g++ $(PG) $(LIBS) -O3 -g -Wall -o $@ $^ -lm -lz -lprotobuf-lite -lsqlite3 + g++ $(PG) $(LIBS) -O3 -g -Wall -o $@ $^ -lm -lz -lprotobuf-lite -lsqlite3 -lpthread enumerate: enumerate.o gcc $(PG) $(LIBS) -O3 -g -Wall -o $@ $^ -lsqlite3 diff --git a/tile.cc b/tile.cc index 71ee72c..811c49b 100644 --- a/tile.cc +++ b/tile.cc @@ -1034,7 +1034,7 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo args[thread].file_minzoom = minzoom; args[thread].file_maxzoom = maxzoom; args[thread].todo = todo; - args[thread].along = &along; // XXX locking + args[thread].along = &along; // locked with var_lock args[thread].gamma = gamma; args[thread].nlayers = nlayers; args[thread].prevent = prevent;