[Box Backup-dev] COMMIT r900 - box/chris/merge/lib/server

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-08-31 23:57:36 +0100 (Thu, 31 Aug 2006)
New Revision: 900

Modified:
   box/chris/merge/lib/server/makeprotocol.pl.in
Log:
(refs #3)

64-bit format fixes (Win32)


Modified: box/chris/merge/lib/server/makeprotocol.pl.in
===================================================================
--- box/chris/merge/lib/server/makeprotocol.pl.in	2006-08-31 22:56:11 UTC (rev 899)
+++ box/chris/merge/lib/server/makeprotocol.pl.in	2006-08-31 22:57:36 UTC (rev 900)
@@ -912,7 +912,6 @@
 close H;
 close CPP;
 
-
 sub obj_is_type
 {
 	my ($c,$ty) = @_;
@@ -981,8 +980,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