diff options
| -rw-r--r-- | Tachometer.c | 2 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | display.c | 1 | ||||
| -rw-r--r-- | display.h | 6 | ||||
| -rw-r--r-- | report.c | 1 | ||||
| -rw-r--r-- | xgpsspeed.c | 1 |
6 files changed, 10 insertions, 9 deletions
diff --git a/Tachometer.c b/Tachometer.c index bbc8b29d..969dad8d 100644 --- a/Tachometer.c +++ b/Tachometer.c @@ -17,7 +17,7 @@ #include <X11/StringDefs.h> #include <TachometerP.h> #include <math.h> -#include "display.h" +#include "config.h" /**************************************************************** * diff --git a/configure.in b/configure.in index fdfcd441..684d9e7a 100644 --- a/configure.in +++ b/configure.in @@ -26,6 +26,14 @@ AC_SUBST(LIBM) AC_CHECK_LIB(c, open, LIBC="-lc") AC_SUBST(LIBC) +AH_VERBATIM([_GNU_SOURCE], + [/* Macro for declaring function arguments unused. */ +#if defined(__GNUC__) +# define UNUSED __attribute__((unused)) /* Flag variable as unused */ +#else /* not __GNUC__ */ +# define UNUSED +#endif]) + dnl Check for X libraries AC_PATH_XTRA LIBS="$LIBS $X_EXTRA_LIBS" @@ -3,6 +3,7 @@ #include <math.h> #include "gps.h" +#include "config.h" #include "display.h" #define DEG2RAD (PI/180.0) @@ -9,10 +9,4 @@ void register_canvas(Widget w, GC gc); void draw_graphics(struct gps_data_t *gpsdata); void redraw(Widget w, XtPointer client_data, XmDrawingAreaCallbackStruct *cbs); -#if defined(__GNUC__) -# define UNUSED __attribute__((unused)) /* Flag variable as unused */ -#else /* not __GNUC__ */ -# define UNUSED -#endif - #endif /* _display_h */ @@ -2,7 +2,6 @@ #include <stdio.h> #include <stdarg.h> #include "gpsd.h" -#include "display.h" void gpsd_report(int errlevel UNUSED, const char *fmt, ... ) /* stub logger for clients that don't supply one */ diff --git a/xgpsspeed.c b/xgpsspeed.c index c8f21b21..1c878576 100644 --- a/xgpsspeed.c +++ b/xgpsspeed.c @@ -20,7 +20,6 @@ #include "xgpsspeed.icon" #include "gps.h" -#include "display.h" static XrmOptionDescRec options[] = { {"-rv", "*reverseVideo", XrmoptionNoArg, "TRUE"}, |