From 730252b299f0cde0043bed7edb5bcf0c3e37fd38 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Wed, 19 Feb 2014 15:39:18 -0700 Subject: [PATCH] locale.c: Change 'and' to '&&' To actually compile on Windows --- locale.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/locale.c b/locale.c index d52559b..3fc55a8 100644 --- a/locale.c +++ b/locale.c @@ -421,37 +421,37 @@ Perl_my_setlocale(pTHX_ int category, const char* locale) * we just set LC_ALL to, so can skip) */ # ifdef USE_LOCALE_TIME result = PerlEnv_getenv("LC_TIME"); - if (result and strNE(result, "")) { + if (result && strNE(result, "")) { setlocale(LC_TIME, result); } # endif # ifdef USE_LOCALE_CTYPE result = PerlEnv_getenv("LC_CTYPE"); - if (result and strNE(result, "")) { + if (result && strNE(result, "")) { setlocale(LC_CTYPE, result); } # endif # ifdef USE_LOCALE_COLLATE result = PerlEnv_getenv("LC_COLLATE"); - if (result and strNE(result, "")) { + if (result && strNE(result, "")) { setlocale(LC_COLLATE, result); } # endif # ifdef USE_LOCALE_MONETARY result = PerlEnv_getenv("LC_MONETARY"); - if (result and strNE(result, "")) { + if (result && strNE(result, "")) { setlocale(LC_MONETARY, result); } # endif # ifdef USE_LOCALE_NUMERIC result = PerlEnv_getenv("LC_NUMERIC"); - if (result and strNE(result, "")) { + if (result && strNE(result, "")) { setlocale(LC_NUMERIC, result); } # endif # ifdef USE_LOCALE_MESSAGES result = PerlEnv_getenv("LC_MESSAGES"); - if (result and strNE(result, "")) { + if (result && strNE(result, "")) { setlocale(LC_MESSAGES, result); } # endif -- 2.7.4