summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--libgpsd.xml5
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 8e0b1964..ef435dc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ if eval "test x$GCC = xyes"; then
dnl -Wcast-qual
fi
-AC_CHECK_HEADERS(termios.h sys/termios.h sys/select.h strings.h sys/filio.h sys/time.h X11/xpm.h xpm.h getopt.h sys/modem.h sys/ipc.h sys/shm.h)
+AC_CHECK_HEADERS(termios.h sys/termios.h sys/select.h strings.h sys/time.h X11/xpm.h xpm.h getopt.h sys/modem.h sys/ipc.h sys/shm.h)
AC_HEADER_TIME
AC_STRUCT_TIMEZONE
diff --git a/libgpsd.xml b/libgpsd.xml
index 42026372..b5c7f550 100644
--- a/libgpsd.xml
+++ b/libgpsd.xml
@@ -133,7 +133,8 @@ activity requiring the GPS, and re-acquire it later.</para>
<para><function>gpsd_poll()</function>
queries the GPS and updates the part of the session structure that
holds position, speed, GPS signal quality, and other data returned
-by the GPS. It returns a mask describing which fields have changed.</para>
+by the GPS. It returns a mask describing which fields have changed.
+This function will not block if no GPS data is waiting.</para>
<para><function>gpsd_wrap()</function>
ends the session, implicitly performing a
@@ -148,7 +149,7 @@ and 2 or higher for debugging messages.</para>
<para>The low-level functions do not allocate or free any dynamic
storage. They can thus be used in a long-running application (such as
<citerefentry><refentrytitle>gpsd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-itself) with a guarantee that thwy won't cause memory leaks.</para>
+itself) with a guarantee that they won't cause memory leaks.</para>
</refsect1>