Attempt to ensure that mask constant expressions won't sign-extend.

All regression tests pass.

1 files changed, 31 insertions, 31 deletions

diff --git a/gpsd.h-tail b/gpsd.h-tail
index d2c3bfba..3b972358 100644
--- a/gpsd.h-tail
+++ b/gpsd.h-tail
@@ -233,37 +233,37 @@ typedef enum {
     event_reactivate,
 } event_t;
 
-#define ONLINE_IS	((gps_mask_t)(1<<1))
-#define TIME_IS 	((gps_mask_t)(1<<2))
-#define TIMERR_IS	((gps_mask_t)(1<<3))
-#define LATLON_IS	((gps_mask_t)(1<<4))
-#define ALTITUDE_IS	((gps_mask_t)(1<<5))
-#define SPEED_IS	((gps_mask_t)(1<<6))
-#define TRACK_IS	((gps_mask_t)(1<<7))
-#define CLIMB_IS	((gps_mask_t)(1<<8))
-#define STATUS_IS	((gps_mask_t)(1<<9))
-#define MODE_IS 	((gps_mask_t)(1<<10))
-#define DOP_IS  	((gps_mask_t)(1<<11))
-#define HERR_IS 	((gps_mask_t)(1<<12))
-#define VERR_IS 	((gps_mask_t)(1<<13))
-#define PERR_IS 	((gps_mask_t)(1<<14))
-#define SATELLITE_IS	((gps_mask_t)(1<<15))
-#define RAW_IS  	((gps_mask_t)(1<<16))
-#define USED_IS 	((gps_mask_t)(1<<17))
-#define SPEEDERR_IS	((gps_mask_t)(1<<18))
-#define DRIVER_IS	((gps_mask_t)(1<<19))
-#define DEVICEID_IS	((gps_mask_t)(1<<20))
-#define ERROR_IS	((gps_mask_t)(1<<21))
-#define RTCM2_IS	((gps_mask_t)(1<<22))
-#define RTCM3_IS	((gps_mask_t)(1<<23))
-#define AIS_IS  	((gps_mask_t)(1<<24))
-#define ATT_IS		((gps_mask_t)(1<<25))
-#define SUBFRAME_IS	((gps_mask_t)(1<<26))
-#define PACKET_IS	((gps_mask_t)(1<<27))
-#define CLEAR_IS	((gps_mask_t)(1<<28))	/* starts a reporting cycle */
-#define REPORT_IS	((gps_mask_t)(1<<29))	/* ends a reporting cycle */
-#define NOISE_IS	((gps_mask_t)(1<<30))
-#define NODATA_IS	((gps_mask_t)(1<<31))	/* no data read from fd */
+#define ONLINE_IS	((gps_mask_t)(1u<<1))
+#define TIME_IS 	((gps_mask_t)(1u<<2))
+#define TIMERR_IS	((gps_mask_t)(1u<<3))
+#define LATLON_IS	((gps_mask_t)(1u<<4))
+#define ALTITUDE_IS	((gps_mask_t)(1u<<5))
+#define SPEED_IS	((gps_mask_t)(1u<<6))
+#define TRACK_IS	((gps_mask_t)(1u<<7))
+#define CLIMB_IS	((gps_mask_t)(1u<<8))
+#define STATUS_IS	((gps_mask_t)(1u<<9))
+#define MODE_IS 	((gps_mask_t)(1u<<10))
+#define DOP_IS  	((gps_mask_t)(1u<<11))
+#define HERR_IS 	((gps_mask_t)(1u<<12))
+#define VERR_IS 	((gps_mask_t)(1u<<13))
+#define PERR_IS 	((gps_mask_t)(1u<<14))
+#define SATELLITE_IS	((gps_mask_t)(1u<<15))
+#define RAW_IS  	((gps_mask_t)(1u<<16))
+#define USED_IS 	((gps_mask_t)(1u<<17))
+#define SPEEDERR_IS	((gps_mask_t)(1u<<18))
+#define DRIVER_IS	((gps_mask_t)(1u<<19))
+#define DEVICEID_IS	((gps_mask_t)(1u<<20))
+#define ERROR_IS	((gps_mask_t)(1u<<21))
+#define RTCM2_IS	((gps_mask_t)(1u<<22))
+#define RTCM3_IS	((gps_mask_t)(1u<<23))
+#define AIS_IS  	((gps_mask_t)(1u<<24))
+#define ATT_IS		((gps_mask_t)(1u<<25))
+#define SUBFRAME_IS	((gps_mask_t)(1u<<26))
+#define PACKET_IS	((gps_mask_t)(1u<<27))
+#define CLEAR_IS	((gps_mask_t)(1u<<28))	/* starts a reporting cycle */
+#define REPORT_IS	((gps_mask_t)(1u<<29))	/* ends a reporting cycle */
+#define NOISE_IS	((gps_mask_t)(1u<<30))
+#define NODATA_IS	((gps_mask_t)(1u<<31))	/* no data read from fd */
 #define DATA_IS	~(ONLINE_IS|PACKET_IS|CLEAR_IS|REPORT_IS)
 
 typedef /*@unsignedintegraltype@*/ unsigned int driver_mask_t;