Merge pull request #202 from jburgess777/compile-fixes

jburgess777 · web-flow · commit 916c9ff1f84a · 2020-09-17T12:43:44.000+01:00
Move variables to prevent duplicates
diff --git a/includes/daemon.h b/includes/daemon.h
@@ -45,7 +45,7 @@ typedef struct {
 
 
 
-struct request_queue * render_request_queue;
+extern struct request_queue * render_request_queue;
 
 void statsRenderFinish(int z, long time);
 void request_exit(void);
diff --git a/includes/render_submit_queue.h b/includes/render_submit_queue.h
@@ -5,8 +5,6 @@ extern "C" {
 #endif
 
 
-int work_complete;
-
 void enqueue(const char *xmlname, int x, int y, int z);
 void spawn_workers(int num, const char *socketpath, int maxLoad);
 void wait_for_empty_queue(void);
diff --git a/src/daemon.c b/src/daemon.c
@@ -49,6 +49,7 @@ static renderd_config config;
 
 int noSlaveRenders;
 
+struct request_queue * render_request_queue;
 
 static const char *cmdStr(enum protoCmd c)
 {
diff --git a/src/render_expired.c b/src/render_expired.c
@@ -89,7 +89,6 @@ unsigned long long twopow[MAX_ZOOM];
 static int minZoom = 0;
 static int maxZoom = 18;
 static int verbose = 0;
-int work_complete;
 static int maxLoad = MAX_LOAD_OLD;
 
 void display_rate(struct timeval start, struct timeval end, int num) 
diff --git a/src/render_list.c b/src/render_list.c
@@ -40,7 +40,6 @@ static int maxZoom = MAX_ZOOM;
 static int verbose = 0;
 static int maxLoad = MAX_LOAD_OLD;
 
-int work_complete;
 
 void display_rate(struct timeval start, struct timeval end, int num) 
 {
diff --git a/src/render_old.c b/src/render_old.c
@@ -47,7 +47,6 @@ static time_t planetTime;
 static struct timeval start, end;
 
 
-int work_complete;
 
 void display_rate(struct timeval start, struct timeval end, int num) 
 {
diff --git a/src/render_submit_queue.c b/src/render_submit_queue.c
@@ -47,6 +47,7 @@ static struct qItem *qHead, *qTail;
 
 static int no_workers;
 static pthread_t *workers;
+static int work_complete;
 
 static void check_load(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ static renderd_config config;`
`49`	`49`
`50`	`50`	`int noSlaveRenders;`
`51`	`51`
	`52`	`+struct request_queue * render_request_queue;`
`52`	`53`
`53`	`54`	`static const char *cmdStr(enum protoCmd c)`
`54`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ static int maxZoom = MAX_ZOOM;`
`40`	`40`	`static int verbose = 0;`
`41`	`41`	`static int maxLoad = MAX_LOAD_OLD;`
`42`	`42`
`43`		`-int work_complete;`
`44`	`43`
`45`	`44`	`void display_rate(struct timeval start, struct timeval end, int num)`
`46`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ static time_t planetTime;`
`47`	`47`	`static struct timeval start, end;`
`48`	`48`
`49`	`49`
`50`		`-int work_complete;`
`51`	`50`
`52`	`51`	`void display_rate(struct timeval start, struct timeval end, int num)`
`53`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ static struct qItem qHead, qTail;`
`47`	`47`
`48`	`48`	`static int no_workers;`
`49`	`49`	`static pthread_t *workers;`
	`50`	`+static int work_complete;`
`50`	`51`
`51`	`52`	`static void check_load(void)`
`52`	`53`	`{`