rename: don't greedily match in the ifdef

Author: ethomson

rename.pl

@@ -115,24 +115,22 @@ sub translate {
 	$contents =~ s/adopt_/${prefix}_/g;
 	$contents =~ s/ADOPT_/${prefix_upper}_/g;
 
-    $contents =~ s/fprintf\(file, "([A-Z])/fprintf\(file, "\l$1/g if($lowercase_status);
+	$contents =~ s/fprintf\(file, "([A-Z])/fprintf\(file, "\l$1/g if($lowercase_status);
 
 	if ($include) {
 		$contents =~ s/^(#include "opt.h")$/#include "${include}"\n$1/mg;
 	}
 
 	if ($inline) {
 		$contents =~ s/^INLINE/${inline}/mg;
-		$contents =~ s/\n#ifdef _MSC_VER\n.*\n#endif\n//sg;
+		$contents =~ s/\n#ifdef _MSC_VER\n.*?\n#endif\n//sg;
 	}
 
 	if ($tests) {
 		$contents =~ s/test_adopt__/test_${tests_name}__/g;
 	}
 
-    $contents =~ s/\n \*\/\n/\n *\n * THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT.\n *\n * This file was produced by using the `rename.pl` script included with\n * adopt.  The command-line specified was:\n *\n * $0 @ARGV\n *\/\n/s;
-
-#    $contents =~ s/\n\n/\n\n\/*\n * THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT.\n *\n * This file was produced by using the `rename.pl` script included with\n * adopt.  The command-line specified was:\n *\n * $0 @ARGV\n *\/\n\n/s;
+	$contents =~ s/\n \*\/\n/\n *\n * THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT.\n *\n * This file was produced by using the `rename.pl` script included with\n * adopt.  The command-line specified was:\n *\n * $0 @ARGV\n *\/\n/s;
 
 	open(OUT, '>' . $out) || die "$0: could not open ${out}: $!\n";
 	print OUT $contents;