Tidy up declarations

2 files changed, 3 insertions, 11 deletions

diff --git a/fractal-gen.c b/fractal-gen.c
index edda171..38cef2f 100644
--- a/fractal-gen.c
+++ b/fractal-gen.c
@@ -26,6 +26,7 @@
  */
 
 #include "fractal-gen.h"
+#include "generator.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -35,12 +36,6 @@
 #include <math.h>
 #include <string.h>
 
-struct section_generator
-{
-	char *executable_name;
-	generator_func generator;
-};
-
 static struct section_generator generators[] = {
 	{ "mandelbrot-gen" , &generate_mandelbrot_section },
 	{ "burning-ship-gen" , &generate_burning_ship_section },
@@ -48,10 +43,6 @@ static struct section_generator generators[] = {
 };
 
 
-/* FIXME put into header */
-double thread_mult = 0.f; /* number to multiply available cores by to get thread count */
-char *argv0 = NULL;
-
 int main(int argc, char **argv)
 {
 	unsigned long x = 0;
diff --git a/fractal-gen.h b/fractal-gen.h
index a25063f..3ae5c89 100644
--- a/fractal-gen.h
+++ b/fractal-gen.h
@@ -46,7 +46,8 @@ unsigned int clust_total;
 unsigned int size;
 unsigned int iterat;
 double power;
-
+double thread_mult = 0.f; /* number to multiply available cores by to get thread count */
+char *argv0 = NULL;
 
 typedef void* (*generator_func)(void *);