summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Hay <steve.m.hay@googlemail.com>2017-07-27 18:13:13 +0100
committerSteve Hay <steve.m.hay@googlemail.com>2017-08-23 21:08:38 +0100
commite9439c00434277bb2480c499f210f78ce8c0f69d (patch)
tree5ecd2c18707093e1ba22791493393e619f615b07
parent432248b02495e4d86c27412a30051b2bea654899 (diff)
downloadperl-e9439c00434277bb2480c499f210f78ce8c0f69d.tar.gz
[perl #131726] [Win32] perl.h remaps 'strtoll' and 'strtoull' incorrectly
Fix by Kai-Uwe Eckhardt <kuehro [...] posteo.de> taken from https://rt.cpan.org/Public/Bug/Display.html?id=121683 as suggested by Sisyphus on perl#131726. (cherry picked from commit 8ed77d12c9275cd4e145ab50aaecf69730166a9b)
-rw-r--r--perl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl.h b/perl.h
index 6c28aac5d2..f3c96a612f 100644
--- a/perl.h
+++ b/perl.h
@@ -6312,7 +6312,7 @@ expression, but with an empty argument list, like this:
# ifdef __hpux
# define strtoll __strtoll /* secret handshake */
# endif
-# ifdef WIN64
+# if defined(WIN64) && defined(_MSC_VER)
# define strtoll _strtoi64 /* secret handshake */
# endif
# if !defined(Strtol) && defined(HAS_STRTOLL)
@@ -6346,7 +6346,7 @@ expression, but with an empty argument list, like this:
# ifdef __hpux
# define strtoull __strtoull /* secret handshake */
# endif
-# ifdef WIN64
+# if defined(WIN64) && defined(_MSC_VER)
# define strtoull _strtoui64 /* secret handshake */
# endif
# if !defined(Strtoul) && defined(HAS_STRTOULL)