From 61eea09395e7a915ccb4ad741cc0cf9fbd0f393b Mon Sep 17 00:00:00 2001
From: Seth Hall <seth@icir.org>
Date: Wed, 13 Apr 2016 16:33:15 -0400
Subject: [PATCH] Avoid a macro name conflict on FreeBSD.

---
 src/analyzer/protocol/rfb/rfb-analyzer.pac | 2 +-
 src/analyzer/protocol/rfb/rfb-protocol.pac | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/analyzer/protocol/rfb/rfb-analyzer.pac b/src/analyzer/protocol/rfb/rfb-analyzer.pac
index b63b9f4085..cd24ea0ced 100644
--- a/src/analyzer/protocol/rfb/rfb-analyzer.pac
+++ b/src/analyzer/protocol/rfb/rfb-analyzer.pac
@@ -81,7 +81,7 @@ refine connection RFB_Conn += {
 		if ( client )
 			{
 			// Set protocol version on client's version
-			int minor_version = bytestring_to_int(${msg.minor},10);
+			int minor_version = bytestring_to_int(${msg.minor_ver},10);
 			version = minor_version;
 
 			// Apple specifies minor version "889" but talks v37
diff --git a/src/analyzer/protocol/rfb/rfb-protocol.pac b/src/analyzer/protocol/rfb/rfb-protocol.pac
index 764046e747..d80416664b 100644
--- a/src/analyzer/protocol/rfb/rfb-protocol.pac
+++ b/src/analyzer/protocol/rfb/rfb-protocol.pac
@@ -17,13 +17,13 @@ enum states {
 
 type RFBProtocolVersion (client: bool) = record {
 	header: "RFB ";
-	major: bytestring &length=3;
+	major_ver: bytestring &length=3;
 	dot: ".";
-	minor: bytestring &length=3;
+	minor_ver: bytestring &length=3;
 	pad: uint8;
 } &let {
 	proc: bool = $context.connection.handle_banners(client, this);
-	proc2: bool = $context.flow.proc_rfb_version(client, major, minor);
+	proc2: bool = $context.flow.proc_rfb_version(client, major_ver, minor_ver);
 }
 
 type RFBSecurityTypes = record {