(refs #3)

64-bit format fixes (Win32)

1 files changed, 8 insertions, 2 deletions

diff --git a/lib/server/makeprotocol.pl.in b/lib/server/makeprotocol.pl.in
index 3dce6118..b5b9dd19 100755
--- a/lib/server/makeprotocol.pl.in
+++ b/lib/server/makeprotocol.pl.in
@@ -912,7 +912,6 @@ __E
 close H;
 close CPP;
 
-
 sub obj_is_type
 {
 	my ($c,$ty) = @_;
@@ -981,8 +980,15 @@ sub make_log_strings
 		{
 			# need to translate it
 			my ($format,$arg) = @{$log_display_types{$ty}};
-			push @str,$format;
 			$arg =~ s/VAR/m$nm/g;
+
+			if ($format eq "0x%llx" and $target_windows)
+			{
+				$format = "0x%I64x";
+				$arg = "(uint64_t)$arg";
+			}
+
+			push @str,$format;
 			push @arg,$arg;
 		}
 		else