Make sure all files that need config.h inclusion have it.

6 files changed, 8 insertions, 24 deletions

diff --git a/display.c b/display.c
index 282a188d..692a276b 100644
--- a/display.c
+++ b/display.c
@@ -3,10 +3,7 @@
 
 #include "gps.h"
 
-#define XCENTER         (double)(width/2)
-#define YCENTER         (double)(height/2)
-#define SCALE           (double)(diameter/2)
-#define DEG2RAD         (3.1415926535897931160E0/180.0)
+#define DEG2RAD         (PI/180.0)
 #define RM		20
 
 #undef min
@@ -56,8 +53,8 @@ static void pol2cart(double azimuth, double elevation, double *xout, double *you
 #else
     elevation = ((90.0 - elevation) / 90.0);
 #endif
-    *xout = XCENTER + sin(azimuth) * elevation * SCALE;
-    *yout = YCENTER - cos(azimuth) * elevation * SCALE;
+    *xout = (width/2) + sin(azimuth) * elevation * (diameter/2);
+    *yout = (height/2) - cos(azimuth) * elevation * (diameter/2);
 }
 
 static void draw_arc(int x, int y, int diam)
diff --git a/gps.c b/gps.c
index 0ccb1099..2c7894f4 100644
--- a/gps.c
+++ b/gps.c
@@ -66,14 +66,11 @@ static Pixel get_pixel(Widget w, char *resource_value)
     XColor exact, color;
 
     colormap = DefaultColormapOfScreen(DefaultScreenOfDisplay(XtDisplay(w)));
-
     status = XAllocNamedColor(XtDisplay(w), colormap, resource_value, &color, &exact);
-
     if (status == 0) {
 	fprintf(stderr, "Unknown color: %s", resource_value);
 	color.pixel = BlackPixelOfScreen(DefaultScreenOfDisplay(XtDisplay(w)));
     };
-
     return (color.pixel);
 }
 
@@ -162,26 +159,19 @@ static void build_gui(Widget lxbApp)
 
     XtSetArg(args[6], XmNtopWidget, rowColumn_11);
     rowColumn_12 = XtCreateManagedWidget("latitude", xmRowColumnWidgetClass, data_panel, args, 7);
-
     XtSetArg(args[6], XmNtopWidget, rowColumn_12);
     rowColumn_13 = XtCreateManagedWidget("longitude", xmRowColumnWidgetClass, data_panel, args, 7);
-
     XtSetArg(args[6], XmNtopWidget, rowColumn_13);
     rowColumn_14 = XtCreateManagedWidget("altitude", xmRowColumnWidgetClass, data_panel, args, 7);
-
     XtSetArg(args[6], XmNtopWidget, rowColumn_14);
     rowColumn_15 = XtCreateManagedWidget("speed", xmRowColumnWidgetClass, data_panel, args, 7);
-
     XtSetArg(args[6], XmNtopWidget, rowColumn_15);
     rowColumn_16 = XtCreateManagedWidget("track", xmRowColumnWidgetClass, data_panel, args, 7);
-
     XtSetArg(args[6], XmNtopWidget, rowColumn_16);
     rowColumn_17 = XtCreateManagedWidget("fix_status", xmRowColumnWidgetClass, data_panel, args, 7);
-
     XtSetArg(args[6], XmNtopWidget, rowColumn_17);
     rowColumn_18 = XtCreateManagedWidget("quit", xmRowColumnWidgetClass, data_panel, args, 7);
 
-
     label_1 = XtCreateManagedWidget("label", xmLabelWidgetClass, rowColumn_11, args, 0);
     label_2 = XtCreateManagedWidget("label", xmLabelWidgetClass, rowColumn_12, args, 0);
     label_3 = XtCreateManagedWidget("label", xmLabelWidgetClass, rowColumn_13, args, 0);
@@ -211,7 +201,6 @@ static void build_gui(Widget lxbApp)
     text_7 = XtCreateManagedWidget("text_7", xmTextFieldWidgetClass,
 				   rowColumn_17, args, 6);
 
-
     pushButton_11 = XtCreateManagedWidget("label",
 			 xmPushButtonWidgetClass, rowColumn_18, args, 0);
     XtAddCallback(pushButton_11, XmNactivateCallback, quit_cb, NULL);
@@ -228,7 +217,6 @@ static void build_gui(Widget lxbApp)
 				     NULL);
 
     XtRealizeWidget(lxbApp);
-
     delw = XmInternAtom(XtDisplay(lxbApp), "WM_DELETE_WINDOW", False);
     XmAddWMProtocolCallback(lxbApp, delw,
 			    (XtCallbackProc)quit_cb, (XtPointer)NULL);
diff --git a/gps.h b/gps.h
index 972d85b1..656a64a8 100644
--- a/gps.h
+++ b/gps.h
@@ -5,9 +5,8 @@
 
 #define MAXCHANNELS	12	/* maximum GPS channels (*not* satellites!) */
 
-struct life_t
+struct life_t {
 /* lifetime structure to be associated with some piece of data */
-{
     time_t	last_refresh;
     int		changed;
 };
@@ -104,6 +103,7 @@ void gps_set_raw_hook(struct gps_data_t *gpsdata, void (*hook)(char *buf));
 #define METERS_TO_FEET	3.2808399
 #define METERS_TO_MILES	0.00062137119
 #define KNOTS_TO_MPH	1.1507794
+#define PI 3.14159265358979323846
 
 /* gps_open() error return values */
 #define NL_NOSERVICE	-1	/* can't get service entry */
diff --git a/netlib.c b/netlib.c
index 1e767c1b..46a0e728 100644
--- a/netlib.c
+++ b/netlib.c
@@ -6,6 +6,7 @@
 #include <netdb.h>
 #include <arpa/inet.h>
 
+#include "config.h"
 #include "gpsd.h"
 
 #if !defined (INADDR_NONE)
diff --git a/nmea_parse.c b/nmea_parse.c
index 50749ef7..1c2d52ad 100644
--- a/nmea_parse.c
+++ b/nmea_parse.c
@@ -1,4 +1,3 @@
-#include "config.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -6,6 +5,7 @@
 #include <string.h>
 #include <stdarg.h>
 
+#include "config.h"
 #include "gpsd.h"
 
 /**************************************************************************
diff --git a/zodiac.c b/zodiac.c
index 59dd7c2a..91f5c07a 100644
--- a/zodiac.c
+++ b/zodiac.c
@@ -2,18 +2,16 @@
  * Handle the Rockwell binary packet format supported by the old Zodiac chipset
  * Everything exported from here is in the structure zodiac_binary at the end.
  */
-#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "config.h"
 #include "gpsd.h"
 
 #ifdef ZODIAC_ENABLE
-#define PI 3.14159265358979323846
-
 enum {
     ZODIAC_HUNT_FF, ZODIAC_HUNT_81, ZODIAC_HUNT_ID, ZODIAC_HUNT_WC,
     ZODIAC_HUNT_FLAGS, ZODIAC_HUNT_CS, ZODIAC_HUNT_DATA, ZODIAC_HUNT_A