diff options
| author | Karl Williamson <khw@cpan.org> | 2018-01-29 20:07:51 -0700 |
|---|---|---|
| committer | Karl Williamson <khw@cpan.org> | 2018-01-30 11:38:12 -0700 |
| commit | 597ee3f45b478da1456092f63d3ac698ee812786 (patch) | |
| tree | 06b4bc7ca936eda234d98ba13502d48acb52c1b7 /proto.h | |
| parent | 9c13cd3cdfa6ab6920882a355869287a277989c3 (diff) | |
| download | perl-597ee3f45b478da1456092f63d3ac698ee812786.tar.gz | |
Use different scheme to handle MSVC6
Recent commit 0b08cab0fc46a5f381ca18a451f55cf12c81d966 caused a function
to not be compiled when running on MSVC6, and hence its callers needed
to use an alternative mechanism there. This is easy enough, it turns
out, but it also turns out that there are more opportunities to call
this function. Rather than having each caller have to know about the
MSVC6 problem, this current commit reimplements the function on that
platform to use a slow, dumb method, so knowing about the issue is
confined to just this one function.
Diffstat (limited to 'proto.h')
| -rw-r--r-- | proto.h | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -3806,13 +3806,6 @@ PERL_CALLCONV int Perl_yylex(pTHX); PERL_CALLCONV int Perl_yyparse(pTHX_ int gramtype); PERL_CALLCONV void Perl_yyquit(pTHX); PERL_CALLCONV void Perl_yyunlex(pTHX); -#if ! defined(EBCDIC) && ! defined USING_MSVC6 -#ifndef PERL_NO_INLINE_FUNCTIONS -PERL_STATIC_INLINE unsigned int S__variant_byte_number(PERL_UINTMAX_T word) - __attribute__warn_unused_result__; -#endif - -#endif #if ! defined(HAS_MEMRCHR) && (defined(PERL_CORE) || defined(PERL_EXT)) #ifndef PERL_NO_INLINE_FUNCTIONS PERL_STATIC_INLINE void * S_my_memrchr(const char * s, const char c, const STRLEN len); @@ -3868,6 +3861,13 @@ PERL_CALLCONV_NO_RET int Perl_magic_regdatum_set(pTHX_ SV* sv, MAGIC* mg) assert(sv); assert(mg) #endif +#if !defined(EBCDIC) +#ifndef PERL_NO_INLINE_FUNCTIONS +PERL_STATIC_INLINE unsigned int S__variant_byte_number(PERL_UINTMAX_T word) + __attribute__warn_unused_result__; +#endif + +#endif #if !defined(HAS_GETENV_LEN) PERL_CALLCONV char* Perl_getenv_len(pTHX_ const char *env_elem, unsigned long *len); #define PERL_ARGS_ASSERT_GETENV_LEN \ |