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

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2006-08-31 23:56:11 +0100 (Thu, 31 Aug 2006)
New Revision: 899

Modified:
   box/chris/merge/lib/server/makeprotocol.pl.in
Log:
Revert to trunk


Modified: box/chris/merge/lib/server/makeprotocol.pl.in
===================================================================
--- box/chris/merge/lib/server/makeprotocol.pl.in	2006-08-31 22:55:35 UTC (rev 898)
+++ box/chris/merge/lib/server/makeprotocol.pl.in	2006-08-31 22:56:11 UTC (rev 899)
@@ -1,9 +1,6 @@
 #!@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)
@@ -170,8 +167,8 @@
 
 # open files
 my $h_filename = 'autogen_'.$protocol_name.'Protocol'.$type.'.h';
-open CPP,'>autogen_'.$protocol_name.'Protocol'.$type.'.cpp.new';
-open H,">$h_filename.new";
+open CPP,'>autogen_'.$protocol_name.'Protocol'.$type.'.cpp';
+open H,">$h_filename";
 
 print CPP <<__E;
 
@@ -915,8 +912,6 @@
 close H;
 close CPP;
 
-update_if_changed('autogen_'.$protocol_name.'Protocol'.$type.'.cpp');
-update_if_changed($h_filename);
 
 sub obj_is_type
 {
@@ -986,15 +981,8 @@
 		{
 			# 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