Avoid a macro name conflict on FreeBSD.

This commit is contained in:
Seth Hall 2016-04-13 16:33:15 -04:00
parent b722fe4540
commit 61eea09395
2 changed files with 4 additions and 4 deletions

View file

@ -81,7 +81,7 @@ refine connection RFB_Conn += {
if ( client ) if ( client )
{ {
// Set protocol version on client's version // 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; version = minor_version;
// Apple specifies minor version "889" but talks v37 // Apple specifies minor version "889" but talks v37

View file

@ -17,13 +17,13 @@ enum states {
type RFBProtocolVersion (client: bool) = record { type RFBProtocolVersion (client: bool) = record {
header: "RFB "; header: "RFB ";
major: bytestring &length=3; major_ver: bytestring &length=3;
dot: "."; dot: ".";
minor: bytestring &length=3; minor_ver: bytestring &length=3;
pad: uint8; pad: uint8;
} &let { } &let {
proc: bool = $context.connection.handle_banners(client, this); 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 { type RFBSecurityTypes = record {