From 3436c41671f2965d831a04ccb2ff860e945ce4a5 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Thu, 26 Feb 2015 04:15:11 -0500
Subject: gps.h gets installed in /usr/include and must not use other
 GPSD-specific files!

It's bad that this get past me. Anybody who tries writing a C client
with 3.12 is going to lose.  Requires a release to fix.

All regression tests pass.
---
 cgps.c      | 1 +
 gps.h       | 1 -
 gpsclient.c | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cgps.c b/cgps.c
index f86a1533..e2c9a7f8 100644
--- a/cgps.c
+++ b/cgps.c
@@ -100,6 +100,7 @@
 
 #include "gpsd_config.h"
 #include "gps.h"
+#include "compiler.h"	/* for UNUSED */
 #include "gpsdclient.h"
 #include "revision.h"
 
diff --git a/gps.h b/gps.h
index c4a98ec8..13e58635 100644
--- a/gps.h
+++ b/gps.h
@@ -21,7 +21,6 @@ extern "C" {
 #ifndef S_SPLINT_S
 #include <pthread.h>	/* pacifies OpenBSD's compiler */
 #endif
-#include "compiler.h"
 
 /*
  * 4.1 - Base version for initial JSON protocol (Dec 2009, release 2.90)
diff --git a/gpsclient.c b/gpsclient.c
index 9e924b99..f1053121 100644
--- a/gpsclient.c
+++ b/gpsclient.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include "gps.h"
 #include "gpsdclient.h"
+#include "compiler.h"	/* for UNUSED */
 
 /*
  * Client utility functions
-- 
cgit v1.2.1