diff options
author | Karl Williamson <public@khwilliamson.com> | 2013-02-25 20:14:26 -0700 |
---|---|---|
committer | Karl Williamson <public@khwilliamson.com> | 2013-08-29 09:55:57 -0600 |
commit | 010ab96b9b802bbf77168b5af384569e053cdb63 (patch) | |
tree | 0e860c4bd54c6c7af3e507314217fac9f8c88518 /proto.h | |
parent | 38bce45e4f5366ae2508941b451d5710880a4c22 (diff) | |
download | perl-010ab96b9b802bbf77168b5af384569e053cdb63.tar.gz |
utf8.c: Swap which fcn wraps the other
This is in preparation for the current wrapee becoming deprecated
Diffstat (limited to 'proto.h')
-rw-r--r-- | proto.h | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -4786,6 +4786,11 @@ PERL_CALLCONV U8* Perl_uvuni_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags) #define PERL_ARGS_ASSERT_UVUNI_TO_UTF8_FLAGS \ assert(d) +PERL_CALLCONV UV Perl_valid_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen) + __attribute__nonnull__(pTHX_1); +#define PERL_ARGS_ASSERT_VALID_UTF8_TO_UVCHR \ + assert(s) + PERL_CALLCONV UV Perl_valid_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen) __attribute__nonnull__(pTHX_1); #define PERL_ARGS_ASSERT_VALID_UTF8_TO_UVUNI \ @@ -4983,11 +4988,6 @@ STATIC int S_sv_2iuv_non_preserve(pTHX_ SV *const sv) #define PERL_ARGS_ASSERT_UVCHR_TO_UTF8 \ assert(d) -/* PERL_CALLCONV UV Perl_valid_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen) - __attribute__nonnull__(pTHX_1); */ -#define PERL_ARGS_ASSERT_VALID_UTF8_TO_UVCHR \ - assert(s) - #endif #if !(defined(HAS_SIGACTION) && defined(SA_SIGINFO)) PERL_CALLCONV Signal_t Perl_csighandler(int sig); @@ -5326,11 +5326,6 @@ PERL_CALLCONV U8* Perl_uvchr_to_utf8(pTHX_ U8 *d, UV uv) #define PERL_ARGS_ASSERT_UVCHR_TO_UTF8 \ assert(d) -PERL_CALLCONV UV Perl_valid_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen) - __attribute__nonnull__(pTHX_1); -#define PERL_ARGS_ASSERT_VALID_UTF8_TO_UVCHR \ - assert(s) - #endif #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) PERL_CALLCONV I32 Perl_do_ipcctl(pTHX_ I32 optype, SV** mark, SV** sp) |