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

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-05-27 09:51:58 +0000 (Sat, 27 May 2006)
New Revision: 592

Modified:
   box/chris/general/lib/server/makeprotocol.pl
Log:
* makeprotocol.pl
- Fixed format on Win32 (causes segfaults)


Modified: box/chris/general/lib/server/makeprotocol.pl
===================================================================
--- box/chris/general/lib/server/makeprotocol.pl	2006-05-27 09:51:13 UTC (rev 591)
+++ box/chris/general/lib/server/makeprotocol.pl	2006-05-27 09:51:58 UTC (rev 592)
@@ -1,6 +1,9 @@
 #!/usr/bin/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