From 913205705fc5303eba97ddc4163558493d0957af Mon Sep 17 00:00:00 2001
From: Graham Knop <haarg@haarg.org>
Date: Mon, 13 Jun 2016 20:47:48 -0400
Subject: [PATCH] check for function existence with defined, not eval+call

Trying to call nonexistent functions can trigger warnings if there is an
AUTOLOAD present (such as with old DynaLoader).  Checking defined on the
functions is a more correct way to check for functions, and avoids the
warnings.
---
 lib/Encode/Locale.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/Encode/Locale.pm b/lib/Encode/Locale.pm
index 1933778..ca57c73 100644
--- a/lib/Encode/Locale.pm
+++ b/lib/Encode/Locale.pm
@@ -27,8 +27,8 @@ sub _init {
 	    eval {
 		unless (defined &GetACP) {
 		    require Win32;
-                    eval { Win32::GetACP() };
-		    *GetACP = sub { &Win32::GetACP } unless $@;
+		    *GetACP = sub { &Win32::GetACP }
+                if defined &Win32::GetACP;
 		}
 		unless (defined &GetACP) {
 		    require Win32::API;
@@ -46,20 +46,20 @@ sub _init {
             unless (defined &GetInputCP) {
                 eval {
                     require Win32;
-                    eval { Win32::GetConsoleCP() };
                     # manually "import" it since Win32->import refuses
-                    *GetInputCP = sub { &Win32::GetConsoleCP } unless $@;
-                    *GetOutputCP = sub { &Win32::GetConsoleOutputCP } unless $@;
+                    *GetInputCP = sub { &Win32::GetConsoleCP }
+                        if defined &Win32::GetConsoleCP;
+                    *GetOutputCP = sub { &Win32::GetConsoleOutputCP }
+                        if defined &Win32::GetConsoleOutputCP;
                 };
                 unless (defined &GetInputCP) {
                     eval {
                         # try Win32::Console module for codepage to use
                         require Win32::Console;
-                        eval { Win32::Console::InputCP() };
                         *GetInputCP = sub { &Win32::Console::InputCP }
-                            unless $@;
+                            if defined &Win32::Console::InputCP;
                         *GetOutputCP = sub { &Win32::Console::OutputCP }
-                            unless $@;
+                            if defined &Win32::Console::OutputCP;
                     };
                 }
                 unless (defined &GetInputCP) {