Merge in a permission fix by Rob Janssen...

..and a type fix that unbreaks the TSIP build.

2 files changed, 2 insertions, 2 deletions

diff --git a/ntpshm.c b/ntpshm.c
index a68b3790..ed998da5 100644
--- a/ntpshm.c
+++ b/ntpshm.c
@@ -50,7 +50,7 @@ struct shmTime {
 static /*@null@*/ struct shmTime *getShmTime(int unit)
 {
     int shmid=shmget ((key_t)(NTPD_BASE+unit), 
-		      sizeof (struct shmTime), IPC_CREAT|0700);
+		      sizeof (struct shmTime), IPC_CREAT|0644);
     if (shmid == -1) {
 	gpsd_report(1, "shmget failed\n");
 	return NULL;
diff --git a/tsip.c b/tsip.c
index 8757d039..4cf1e41d 100644
--- a/tsip.c
+++ b/tsip.c
@@ -223,7 +223,7 @@ static gps_mask_t tsip_analyze(struct gps_device_t *session)
 	session->driver.tsip.last_46 = now;
 	u1 = getub(buf,0);			/* Status code */
 	u2 = getub(buf,1);			/* Antenna/Battery */
-        if (u1 != (uchar)0) {
+        if (u1 != (u_int8_t)0) {
             session->gpsdata.status = STATUS_NO_FIX;
 	    mask |= STATUS_SET;
         }