summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authorJon Schlueter <jon.schlueter@gmail.com>2015-01-08 21:46:55 -0500
committerJon Schlueter <jon.schlueter@gmail.com>2015-01-08 21:46:55 -0500
commitd76f01166602f8581a53e0f7b6a51447e15c576d (patch)
tree6bc21b8e451b49cabe608681dacdf8a83c344d38 /packet.c
parent40638300c9652e5ac72e3cf2e5c6ed3c4190046d (diff)
downloadgpsd-d76f01166602f8581a53e0f7b6a51447e15c576d.tar.gz
Adding missing PASSTHROUGH_ENABLE ifdef guards in packet.c
scons passthrough=false was failing on several missing ifdef guards for JSON_LEADER blocks. Added matching ifdef guards to allow it to compile cleanly
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/packet.c b/packet.c
index 7a5d89ef..1cf2a5a9 100644
--- a/packet.c
+++ b/packet.c
@@ -544,10 +544,13 @@ static void nextstate(struct gps_lexer_t *lexer, unsigned char c)
else if (c == 0xb5) /* LEA-5H can and will output NMEA and UBX back to back */
lexer->state = UBX_LEADER_1;
#endif
+#ifdef PASSTHROUGH_ENABLE
else if (c == '{') {
lexer->state = JSON_LEADER;
character_pushback(lexer);
- } else
+ }
+#endif /* PASSTHROUGH_ENABLE */
+ else
lexer->state = GROUND_STATE;
break;
case SEATALK_LEAD_1:
@@ -1089,10 +1092,13 @@ static void nextstate(struct gps_lexer_t *lexer, unsigned char c)
else if (c == '$') /* LEA-5H can and will output NMEA and UBX back to back */
lexer->state = NMEA_DOLLAR;
#endif /* NMEA_ENABLE */
+#ifdef PASSTHROUGH_ENABLE
else if (c == '{') {
lexer->state = JSON_LEADER;
character_pushback(lexer);
- } else
+ }
+#endif /* PASSTHROUGH_ENABLE */
+ else
lexer->state = GROUND_STATE;
break;
#endif /* UBLOX_ENABLE */