Skip to content

check for function existence with defined, not eval+call #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
haarg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

check for function existence with defined, not eval+call #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lib/Encode/Locale.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down