diff options
| author | Nicholas Clark <nick@ccl4.org> | 2013-05-04 22:03:59 +0200 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2013-05-20 21:19:42 +0200 |
| commit | 8e2d7c446d5ab31e6c8e661a3c17f0f0b199d525 (patch) | |
| tree | b2040d4be9d29967368829dda6867005ba78ff5b /pp_pack.c | |
| parent | 260c6fee6deba90b42b0734fbdea2fea1d69c9bc (diff) | |
| download | perl-8e2d7c446d5ab31e6c8e661a3c17f0f0b199d525.tar.gz | |
Provide ntohl, ntohs, htonl and htons no-op macros on big endian systems.
This means that there are always macros or functions for ntohl, ntohs,
htonl and htons available, so eliminate use of HAS_NTOHL etc, and
unconditionally compile the code that it was protecting. However, as code
on CPAN is using these guard macros, define all of them in perl.h
(Technically the 4 are not quite no-ops, as they truncate their values to
32 or 16 bits, to be consistent with the implementations for platforms which
need re-ordering.)
Diffstat (limited to 'pp_pack.c')
| -rw-r--r-- | pp_pack.c | 12 |
1 files changed, 0 insertions, 12 deletions
@@ -1476,10 +1476,8 @@ S_unpack_rec(pTHX_ tempsym_t* symptr, const char *s, const char *strbeg, const c #endif SHIFT16(utf8, s, strend, &au16, datumtype); DO_BO_UNPACK(au16, 16); -#ifdef HAS_NTOHS if (datumtype == 'n') au16 = PerlSock_ntohs(au16); -#endif if (datumtype == 'v') au16 = vtohs(au16); if (!checksum) @@ -1498,10 +1496,8 @@ S_unpack_rec(pTHX_ tempsym_t* symptr, const char *s, const char *strbeg, const c ai16 = 0; # endif SHIFT16(utf8, s, strend, &ai16, datumtype); -# ifdef HAS_NTOHS if (datumtype == ('n' | TYPE_IS_SHRIEKING)) ai16 = (I16) PerlSock_ntohs((U16) ai16); -# endif /* HAS_NTOHS */ if (datumtype == ('v' | TYPE_IS_SHRIEKING)) ai16 = (I16) vtohs((U16) ai16); if (!checksum) @@ -1645,10 +1641,8 @@ S_unpack_rec(pTHX_ tempsym_t* symptr, const char *s, const char *strbeg, const c #endif SHIFT32(utf8, s, strend, &au32, datumtype); DO_BO_UNPACK(au32, 32); -#ifdef HAS_NTOHL if (datumtype == 'N') au32 = PerlSock_ntohl(au32); -#endif if (datumtype == 'V') au32 = vtohl(au32); if (!checksum) @@ -1667,10 +1661,8 @@ S_unpack_rec(pTHX_ tempsym_t* symptr, const char *s, const char *strbeg, const c ai32 = 0; #endif SHIFT32(utf8, s, strend, &ai32, datumtype); -#ifdef HAS_NTOHL if (datumtype == ('N' | TYPE_IS_SHRIEKING)) ai32 = (I32)PerlSock_ntohl((U32)ai32); -#endif if (datumtype == ('V' | TYPE_IS_SHRIEKING)) ai32 = (I32)vtohl((U32)ai32); if (!checksum) @@ -2863,9 +2855,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist ) I16 ai16; fromstr = NEXTFROM; ai16 = (I16)SvIV(fromstr); -#ifdef HAS_HTONS ai16 = PerlSock_htons(ai16); -#endif PUSH16(utf8, cur, &ai16); } break; @@ -3070,9 +3060,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist ) U32 au32; fromstr = NEXTFROM; au32 = SvUV(fromstr); -#ifdef HAS_HTONL au32 = PerlSock_htonl(au32); -#endif PUSH32(utf8, cur, &au32); } break; |