[Box Backup-dev] COMMIT r686 - box/chris/general/lib/server

boxbackup-dev@fluffy.co.uk boxbackup-dev@fluffy.co.uk
Sun, 23 Jul 2006 22:29:33 +0000 (GMT)


Author: chris
Date: 2006-07-23 22:29:26 +0000 (Sun, 23 Jul 2006)
New Revision: 686

Modified:
   box/chris/general/lib/server/makeprotocol.pl.in
Log:
* makeprotocol.pl.in
- Fix Windows format bug, lost in merge


Modified: box/chris/general/lib/server/makeprotocol.pl.in
===================================================================
--- box/chris/general/lib/server/makeprotocol.pl.in	2006-07-23 22:25:45 UTC (rev 685)
+++ box/chris/general/lib/server/makeprotocol.pl.in	2006-07-23 22:29:26 UTC (rev 686)
@@ -1,6 +1,9 @@
 #!@PERL@
 use strict;
 
+use lib "../../infrastructure";
+use BoxPlatform;
+
 # Make protocol C++ classes from a protocol description file
 
 # built in type info (values are is basic type, C++ typename)
@@ -981,8 +984,15 @@
 		{
 			# need to translate it
 			my ($format,$arg) = @{$log_display_types{$ty}};
+			$arg =~ s/VAR/m$nm/g;
+
+			if ($format eq "0x%llx" and $target_windows)
+			{
+				$format = "0x%I64x";
+				$arg = "(uint64_t)$arg";
+			}
+
 			push @str,$format;
-			$arg =~ s/VAR/m$nm/g;
 			push @arg,$arg;
 		}
 		else