summaryrefslogtreecommitdiff
path: root/shmexport.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2014-08-18 04:01:05 -0400
committerEric S. Raymond <esr@thyrsus.com>2014-08-18 04:01:05 -0400
commitcaf45e635c8a3f2446a19b77e7842030ec10d2de (patch)
tree409928dd76f6f96c9ef2e20e95c5b522e5b511c1 /shmexport.c
parent117b8c2fcc577ec6eb1730fb554c91ab081f2cf5 (diff)
downloadgpsd-caf45e635c8a3f2446a19b77e7842030ec10d2de.tar.gz
First part of Android port patches: deal with in_port_t. SUN_LEN, and getsid().
Also, fix how configuratuin in libgps_shm.c and smexport.h is handled. Based on a patch by Samuel Cuella <samuel.cuella@supinfo.com>, but cleaned up some to obey local conventions better. All regression tests pass.
Diffstat (limited to 'shmexport.c')
-rw-r--r--shmexport.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/shmexport.c b/shmexport.c
index 3b764b57..f8645941 100644
--- a/shmexport.c
+++ b/shmexport.c
@@ -14,6 +14,10 @@ PERMISSIONS
BSD terms apply: see the file COPYING in the distribution root for details.
***************************************************************************/
+#include "gpsd_config.h"
+
+#ifdef SHM_EXPORT_ENABLE
+
#include <stddef.h>
#include <string.h>
#include <errno.h>
@@ -24,8 +28,6 @@ PERMISSIONS
#include "gpsd.h"
#include "libgps.h" /* for SHM_PSEUDO_FD */
-#ifdef SHM_EXPORT_ENABLE
-
/*@ -mustfreeonly -nullstate -mayaliasunique @*/
bool shm_acquire(struct gps_context_t *context)