Some portability fixes.

include/Makefile.am: use @PERL@ to call scripts/dheadgen.pl - don't rely on #! /usr/bin/perl
scripts/dheadgen.pl: use 2-arg open() for compatibility with older Perl versions
storage/innobase/srv/srv0srv.c: Don't use C++-style comments in C code

1 files changed, 6 insertions, 6 deletions

diff --git a/scripts/dheadgen.pl b/scripts/dheadgen.pl
index 5ead0f90a31..374b232a04e 100755
--- a/scripts/dheadgen.pl
+++ b/scripts/dheadgen.pl
@@ -267,23 +267,23 @@ usage() if ($infile !~ /(.+)\.d$/);
 # If the system has native support for DTrace, we'll use that binary instead.
 #
 if (-x '/usr/sbin/dtrace' && !$force) {
-	open(my $dt, '-|', "/usr/sbin/dtrace -C -h -s $infile -o /dev/stdout")
+	open(DTRACE, "-| /usr/sbin/dtrace -C -h -s $infile -o /dev/stdout")
 	    or die "can't invoke dtrace(1M)";
 
-	while (<$dt>) {
+	while (<DTRACE>) {
 		emit_dtrace($_);
 	}
 
-	close($dt);
+	close(DTRACE);
 
 	exit(0);
 }
 
 emit_prologue($infile);
 
-open(my $d, '<', $infile) or die "couldn't open $infile";
-@lines = <$d>;
-close($d);
+open(D, "< $infile") or die "couldn't open $infile";
+@lines = <D>;
+close(D);
 
 while (1) {
 	my $nl = 0;