postgres.git / summary / log / commit / refs

commit    8ddf9c1dc020d569d3a0aa22e3269a64e8a4ef23
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Fri Dec 22 13:56:27 2023 +0000
First released in: 17.0

    Make win32tzlist.pl checkable again
    
    Commit 1301c80b21 removed some infrastructure needed to check
    windows-oriented perl scripts. It also removed most such scripts, but
    this one was left over. We repair the damage by making Win32::Registry a
    conditional requirement that is only loaded on Windows. With this change
    `perl -cw win32tzlist.pl` once again passes on non-Windows machines.
    
    Discussion: https://postgr.es/m/a2bd77fd-61b8-4c2b-b12e-3e22ae260f82@eisentraut.org


 src/tools/win32tzlist.pl | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/tools/win32tzlist.pl b/src/tools/win32tzlist.pl
index 657f7d4879c..457462df274 100755
--- a/src/tools/win32tzlist.pl
+++ b/src/tools/win32tzlist.pl
@@ -18,7 +18,18 @@
 use strict;
 use warnings;
 
-use Win32::Registry;
+use Config;
+
+our $HKEY_LOCAL_MACHINE;
+
+BEGIN
+{
+	if ($Config{osname} eq 'MSWin32' || $Config{osname} eq 'msys')
+	{
+		require Win32::Registry;
+		Win32::Registry->import;
+	}
+}
 
 my $tzfile = 'src/bin/initdb/findtimezone.c';
 


[parent: 8793c6005154]