Eliminate my_{hto[bl]e,[bl]etoh}{16,32,64,s,i,l} as nothing now uses them.

5 files changed, 0 insertions, 519 deletions

diff --git a/embed.fnc b/embed.fnc
index 70f5889183..74086132a3 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -2458,80 +2458,6 @@ sMd	|SV*	|find_uninit_var|NULLOK const OP *const obase \
 		|NULLOK const SV *const uninit_sv|bool top
 #endif
 
-#ifdef PERL_NEED_MY_HTOLE16
-np	|U16	|my_htole16	|U16 n
-#endif
-#ifdef PERL_NEED_MY_LETOH16
-np	|U16	|my_letoh16	|U16 n
-#endif
-#ifdef PERL_NEED_MY_HTOBE16
-np	|U16	|my_htobe16	|U16 n
-#endif
-#ifdef PERL_NEED_MY_BETOH16
-np	|U16	|my_betoh16	|U16 n
-#endif
-#ifdef PERL_NEED_MY_HTOLE32
-np	|U32	|my_htole32	|U32 n
-#endif
-#ifdef PERL_NEED_MY_LETOH32
-np	|U32	|my_letoh32	|U32 n
-#endif
-#ifdef PERL_NEED_MY_HTOBE32
-np	|U32	|my_htobe32	|U32 n
-#endif
-#ifdef PERL_NEED_MY_BETOH32
-np	|U32	|my_betoh32	|U32 n
-#endif
-#ifdef PERL_NEED_MY_HTOLE64
-np	|U64	|my_htole64	|U64 n
-#endif
-#ifdef PERL_NEED_MY_LETOH64
-np	|U64	|my_letoh64	|U64 n
-#endif
-#ifdef PERL_NEED_MY_HTOBE64
-np	|U64	|my_htobe64	|U64 n
-#endif
-#ifdef PERL_NEED_MY_BETOH64
-np	|U64	|my_betoh64	|U64 n
-#endif
-
-#ifdef PERL_NEED_MY_HTOLES
-np	|short	|my_htoles	|short n
-#endif
-#ifdef PERL_NEED_MY_LETOHS
-np	|short	|my_letohs	|short n
-#endif
-#ifdef PERL_NEED_MY_HTOBES
-np	|short	|my_htobes	|short n
-#endif
-#ifdef PERL_NEED_MY_BETOHS
-np	|short	|my_betohs	|short n
-#endif
-#ifdef PERL_NEED_MY_HTOLEI
-np	|int	|my_htolei	|int n
-#endif
-#ifdef PERL_NEED_MY_LETOHI
-np	|int	|my_letohi	|int n
-#endif
-#ifdef PERL_NEED_MY_HTOBEI
-np	|int	|my_htobei	|int n
-#endif
-#ifdef PERL_NEED_MY_BETOHI
-np	|int	|my_betohi	|int n
-#endif
-#ifdef PERL_NEED_MY_HTOLEL
-np	|long	|my_htolel	|long n
-#endif
-#ifdef PERL_NEED_MY_LETOHL
-np	|long	|my_letohl	|long n
-#endif
-#ifdef PERL_NEED_MY_HTOBEL
-np	|long	|my_htobel	|long n
-#endif
-#ifdef PERL_NEED_MY_BETOHL
-np	|long	|my_betohl	|long n
-#endif
-
 : I think that these are only used by the above, which are macros, and in turn
 : currently they are only used in pp_pack.c, but this is in util.c
 np	|void	|my_swabn	|NN void* ptr|int n
diff --git a/embed.h b/embed.h
index 2cd19f841c..dd7708fdc4 100644
--- a/embed.h
+++ b/embed.h
@@ -1696,78 +1696,6 @@
 #define xmldump_sub_perl(a,b)	Perl_xmldump_sub_perl(aTHX_ a,b)
 #define xmldump_vindent(a,b,c,d)	Perl_xmldump_vindent(aTHX_ a,b,c,d)
 #  endif
-#  if defined(PERL_NEED_MY_BETOH16)
-#define my_betoh16		Perl_my_betoh16
-#  endif
-#  if defined(PERL_NEED_MY_BETOH32)
-#define my_betoh32		Perl_my_betoh32
-#  endif
-#  if defined(PERL_NEED_MY_BETOH64)
-#define my_betoh64		Perl_my_betoh64
-#  endif
-#  if defined(PERL_NEED_MY_BETOHI)
-#define my_betohi		Perl_my_betohi
-#  endif
-#  if defined(PERL_NEED_MY_BETOHL)
-#define my_betohl		Perl_my_betohl
-#  endif
-#  if defined(PERL_NEED_MY_BETOHS)
-#define my_betohs		Perl_my_betohs
-#  endif
-#  if defined(PERL_NEED_MY_HTOBE16)
-#define my_htobe16		Perl_my_htobe16
-#  endif
-#  if defined(PERL_NEED_MY_HTOBE32)
-#define my_htobe32		Perl_my_htobe32
-#  endif
-#  if defined(PERL_NEED_MY_HTOBE64)
-#define my_htobe64		Perl_my_htobe64
-#  endif
-#  if defined(PERL_NEED_MY_HTOBEI)
-#define my_htobei		Perl_my_htobei
-#  endif
-#  if defined(PERL_NEED_MY_HTOBEL)
-#define my_htobel		Perl_my_htobel
-#  endif
-#  if defined(PERL_NEED_MY_HTOBES)
-#define my_htobes		Perl_my_htobes
-#  endif
-#  if defined(PERL_NEED_MY_HTOLE16)
-#define my_htole16		Perl_my_htole16
-#  endif
-#  if defined(PERL_NEED_MY_HTOLE32)
-#define my_htole32		Perl_my_htole32
-#  endif
-#  if defined(PERL_NEED_MY_HTOLE64)
-#define my_htole64		Perl_my_htole64
-#  endif
-#  if defined(PERL_NEED_MY_HTOLEI)
-#define my_htolei		Perl_my_htolei
-#  endif
-#  if defined(PERL_NEED_MY_HTOLEL)
-#define my_htolel		Perl_my_htolel
-#  endif
-#  if defined(PERL_NEED_MY_HTOLES)
-#define my_htoles		Perl_my_htoles
-#  endif
-#  if defined(PERL_NEED_MY_LETOH16)
-#define my_letoh16		Perl_my_letoh16
-#  endif
-#  if defined(PERL_NEED_MY_LETOH32)
-#define my_letoh32		Perl_my_letoh32
-#  endif
-#  if defined(PERL_NEED_MY_LETOH64)
-#define my_letoh64		Perl_my_letoh64
-#  endif
-#  if defined(PERL_NEED_MY_LETOHI)
-#define my_letohi		Perl_my_letohi
-#  endif
-#  if defined(PERL_NEED_MY_LETOHL)
-#define my_letohl		Perl_my_letohl
-#  endif
-#  if defined(PERL_NEED_MY_LETOHS)
-#define my_letohs		Perl_my_letohs
-#  endif
 #  if defined(PERL_USES_PL_PIDSTATUS) && defined(PERL_IN_UTIL_C)
 #define pidgone(a,b)		S_pidgone(aTHX_ a,b)
 #  endif
diff --git a/perl.h b/perl.h
index 17e6299f67..b492f7c708 100644
--- a/perl.h
+++ b/perl.h
@@ -798,74 +798,6 @@ EXTERN_C int usleep(unsigned int);
 /*----------------------------------------------------------------------------*/
 # if BYTEORDER == 0x1234 || BYTEORDER == 0x12345678  /*     little-endian     */
 /*----------------------------------------------------------------------------*/
-#  define my_htole16(x)		(x)
-#  define my_letoh16(x)		(x)
-#  define my_htole32(x)		(x)
-#  define my_letoh32(x)		(x)
-#  define my_htobe16(x)		_swab_16_(x)
-#  define my_betoh16(x)		_swab_16_(x)
-#  define my_htobe32(x)		_swab_32_(x)
-#  define my_betoh32(x)		_swab_32_(x)
-#  ifdef HAS_QUAD
-#   define my_htole64(x)	(x)
-#   define my_letoh64(x)	(x)
-#   define my_htobe64(x)	_swab_64_(x)
-#   define my_betoh64(x)	_swab_64_(x)
-#  endif
-#  define my_htoles(x)		(x)
-#  define my_letohs(x)		(x)
-#  define my_htolei(x)		(x)
-#  define my_letohi(x)		(x)
-#  define my_htolel(x)		(x)
-#  define my_letohl(x)		(x)
-#  if SHORTSIZE == 1
-#   define my_htobes(x)		(x)
-#   define my_betohs(x)		(x)
-#  elif SHORTSIZE == 2
-#   define my_htobes(x)		_swab_16_(x)
-#   define my_betohs(x)		_swab_16_(x)
-#  elif SHORTSIZE == 4
-#   define my_htobes(x)		_swab_32_(x)
-#   define my_betohs(x)		_swab_32_(x)
-#  elif SHORTSIZE == 8
-#   define my_htobes(x)		_swab_64_(x)
-#   define my_betohs(x)		_swab_64_(x)
-#  else
-#   define PERL_NEED_MY_HTOBES
-#   define PERL_NEED_MY_BETOHS
-#  endif
-#  if INTSIZE == 1
-#   define my_htobei(x)		(x)
-#   define my_betohi(x)		(x)
-#  elif INTSIZE == 2
-#   define my_htobei(x)		_swab_16_(x)
-#   define my_betohi(x)		_swab_16_(x)
-#  elif INTSIZE == 4
-#   define my_htobei(x)		_swab_32_(x)
-#   define my_betohi(x)		_swab_32_(x)
-#  elif INTSIZE == 8
-#   define my_htobei(x)		_swab_64_(x)
-#   define my_betohi(x)		_swab_64_(x)
-#  else
-#   define PERL_NEED_MY_HTOBEI
-#   define PERL_NEED_MY_BETOHI
-#  endif
-#  if LONGSIZE == 1
-#   define my_htobel(x)		(x)
-#   define my_betohl(x)		(x)
-#  elif LONGSIZE == 2
-#   define my_htobel(x)		_swab_16_(x)
-#   define my_betohl(x)		_swab_16_(x)
-#  elif LONGSIZE == 4
-#   define my_htobel(x)		_swab_32_(x)
-#   define my_betohl(x)		_swab_32_(x)
-#  elif LONGSIZE == 8
-#   define my_htobel(x)		_swab_64_(x)
-#   define my_betohl(x)		_swab_64_(x)
-#  else
-#   define PERL_NEED_MY_HTOBEL
-#   define PERL_NEED_MY_BETOHL
-#  endif
 #  define my_htolen(p,n)	NOOP
 #  define my_letohn(p,n)	NOOP
 #  define my_htoben(p,n)	my_swabn(p,n)
@@ -873,74 +805,6 @@ EXTERN_C int usleep(unsigned int);
 /*----------------------------------------------------------------------------*/
 # elif BYTEORDER == 0x4321 || BYTEORDER == 0x87654321  /*     big-endian      */
 /*----------------------------------------------------------------------------*/
-#  define my_htobe16(x)		(x)
-#  define my_betoh16(x)		(x)
-#  define my_htobe32(x)		(x)
-#  define my_betoh32(x)		(x)
-#  define my_htole16(x)		_swab_16_(x)
-#  define my_letoh16(x)		_swab_16_(x)
-#  define my_htole32(x)		_swab_32_(x)
-#  define my_letoh32(x)		_swab_32_(x)
-#  ifdef HAS_QUAD
-#   define my_htobe64(x)	(x)
-#   define my_betoh64(x)	(x)
-#   define my_htole64(x)	_swab_64_(x)
-#   define my_letoh64(x)	_swab_64_(x)
-#  endif
-#  define my_htobes(x)		(x)
-#  define my_betohs(x)		(x)
-#  define my_htobei(x)		(x)
-#  define my_betohi(x)		(x)
-#  define my_htobel(x)		(x)
-#  define my_betohl(x)		(x)
-#  if SHORTSIZE == 1
-#   define my_htoles(x)		(x)
-#   define my_letohs(x)		(x)
-#  elif SHORTSIZE == 2
-#   define my_htoles(x)		_swab_16_(x)
-#   define my_letohs(x)		_swab_16_(x)
-#  elif SHORTSIZE == 4
-#   define my_htoles(x)		_swab_32_(x)
-#   define my_letohs(x)		_swab_32_(x)
-#  elif SHORTSIZE == 8
-#   define my_htoles(x)		_swab_64_(x)
-#   define my_letohs(x)		_swab_64_(x)
-#  else
-#   define PERL_NEED_MY_HTOLES
-#   define PERL_NEED_MY_LETOHS
-#  endif
-#  if INTSIZE == 1
-#   define my_htolei(x)		(x)
-#   define my_letohi(x)		(x)
-#  elif INTSIZE == 2
-#   define my_htolei(x)		_swab_16_(x)
-#   define my_letohi(x)		_swab_16_(x)
-#  elif INTSIZE == 4
-#   define my_htolei(x)		_swab_32_(x)
-#   define my_letohi(x)		_swab_32_(x)
-#  elif INTSIZE == 8
-#   define my_htolei(x)		_swab_64_(x)
-#   define my_letohi(x)		_swab_64_(x)
-#  else
-#   define PERL_NEED_MY_HTOLEI
-#   define PERL_NEED_MY_LETOHI
-#  endif
-#  if LONGSIZE == 1
-#   define my_htolel(x)		(x)
-#   define my_letohl(x)		(x)
-#  elif LONGSIZE == 2
-#   define my_htolel(x)		_swab_16_(x)
-#   define my_letohl(x)		_swab_16_(x)
-#  elif LONGSIZE == 4
-#   define my_htolel(x)		_swab_32_(x)
-#   define my_letohl(x)		_swab_32_(x)
-#  elif LONGSIZE == 8
-#   define my_htolel(x)		_swab_64_(x)
-#   define my_letohl(x)		_swab_64_(x)
-#  else
-#   define PERL_NEED_MY_HTOLEL
-#   define PERL_NEED_MY_LETOHL
-#  endif
 #  define my_htolen(p,n)	my_swabn(p,n)
 #  define my_letohn(p,n)	my_swabn(p,n)
 #  define my_htoben(p,n)	NOOP
@@ -948,32 +812,6 @@ EXTERN_C int usleep(unsigned int);
 /*----------------------------------------------------------------------------*/
 # else /*                       all other byte-orders                         */
 /*----------------------------------------------------------------------------*/
-#  define PERL_NEED_MY_HTOLE16
-#  define PERL_NEED_MY_LETOH16
-#  define PERL_NEED_MY_HTOBE16
-#  define PERL_NEED_MY_BETOH16
-#  define PERL_NEED_MY_HTOLE32
-#  define PERL_NEED_MY_LETOH32
-#  define PERL_NEED_MY_HTOBE32
-#  define PERL_NEED_MY_BETOH32
-#  ifdef HAS_QUAD
-#   define PERL_NEED_MY_HTOLE64
-#   define PERL_NEED_MY_LETOH64
-#   define PERL_NEED_MY_HTOBE64
-#   define PERL_NEED_MY_BETOH64
-#  endif
-#  define PERL_NEED_MY_HTOLES
-#  define PERL_NEED_MY_LETOHS
-#  define PERL_NEED_MY_HTOBES
-#  define PERL_NEED_MY_BETOHS
-#  define PERL_NEED_MY_HTOLEI
-#  define PERL_NEED_MY_LETOHI
-#  define PERL_NEED_MY_HTOBEI
-#  define PERL_NEED_MY_BETOHI
-#  define PERL_NEED_MY_HTOLEL
-#  define PERL_NEED_MY_LETOHL
-#  define PERL_NEED_MY_HTOBEL
-#  define PERL_NEED_MY_BETOHL
 /*----------------------------------------------------------------------------*/
 # endif /*                     end of byte-order macros                       */
 /*----------------------------------------------------------------------------*/
diff --git a/proto.h b/proto.h
index 5c8f779c0c..5bf4d39521 100644
--- a/proto.h
+++ b/proto.h
@@ -7597,78 +7597,6 @@ PERL_CALLCONV void	Perl_xmldump_vindent(pTHX_ I32 level, PerlIO *file, const cha
 	assert(file); assert(pat)
 
 #endif
-#if defined(PERL_NEED_MY_BETOH16)
-PERL_CALLCONV U16	Perl_my_betoh16(U16 n);
-#endif
-#if defined(PERL_NEED_MY_BETOH32)
-PERL_CALLCONV U32	Perl_my_betoh32(U32 n);
-#endif
-#if defined(PERL_NEED_MY_BETOH64)
-PERL_CALLCONV U64	Perl_my_betoh64(U64 n);
-#endif
-#if defined(PERL_NEED_MY_BETOHI)
-PERL_CALLCONV int	Perl_my_betohi(int n);
-#endif
-#if defined(PERL_NEED_MY_BETOHL)
-PERL_CALLCONV long	Perl_my_betohl(long n);
-#endif
-#if defined(PERL_NEED_MY_BETOHS)
-PERL_CALLCONV short	Perl_my_betohs(short n);
-#endif
-#if defined(PERL_NEED_MY_HTOBE16)
-PERL_CALLCONV U16	Perl_my_htobe16(U16 n);
-#endif
-#if defined(PERL_NEED_MY_HTOBE32)
-PERL_CALLCONV U32	Perl_my_htobe32(U32 n);
-#endif
-#if defined(PERL_NEED_MY_HTOBE64)
-PERL_CALLCONV U64	Perl_my_htobe64(U64 n);
-#endif
-#if defined(PERL_NEED_MY_HTOBEI)
-PERL_CALLCONV int	Perl_my_htobei(int n);
-#endif
-#if defined(PERL_NEED_MY_HTOBEL)
-PERL_CALLCONV long	Perl_my_htobel(long n);
-#endif
-#if defined(PERL_NEED_MY_HTOBES)
-PERL_CALLCONV short	Perl_my_htobes(short n);
-#endif
-#if defined(PERL_NEED_MY_HTOLE16)
-PERL_CALLCONV U16	Perl_my_htole16(U16 n);
-#endif
-#if defined(PERL_NEED_MY_HTOLE32)
-PERL_CALLCONV U32	Perl_my_htole32(U32 n);
-#endif
-#if defined(PERL_NEED_MY_HTOLE64)
-PERL_CALLCONV U64	Perl_my_htole64(U64 n);
-#endif
-#if defined(PERL_NEED_MY_HTOLEI)
-PERL_CALLCONV int	Perl_my_htolei(int n);
-#endif
-#if defined(PERL_NEED_MY_HTOLEL)
-PERL_CALLCONV long	Perl_my_htolel(long n);
-#endif
-#if defined(PERL_NEED_MY_HTOLES)
-PERL_CALLCONV short	Perl_my_htoles(short n);
-#endif
-#if defined(PERL_NEED_MY_LETOH16)
-PERL_CALLCONV U16	Perl_my_letoh16(U16 n);
-#endif
-#if defined(PERL_NEED_MY_LETOH32)
-PERL_CALLCONV U32	Perl_my_letoh32(U32 n);
-#endif
-#if defined(PERL_NEED_MY_LETOH64)
-PERL_CALLCONV U64	Perl_my_letoh64(U64 n);
-#endif
-#if defined(PERL_NEED_MY_LETOHI)
-PERL_CALLCONV int	Perl_my_letohi(int n);
-#endif
-#if defined(PERL_NEED_MY_LETOHL)
-PERL_CALLCONV long	Perl_my_letohl(long n);
-#endif
-#if defined(PERL_NEED_MY_LETOHS)
-PERL_CALLCONV short	Perl_my_letohs(short n);
-#endif
 #if defined(PERL_USES_PL_PIDSTATUS) && defined(PERL_IN_UTIL_C)
 STATIC void	S_pidgone(pTHX_ Pid_t pid, int status);
 #endif
diff --git a/util.c b/util.c
index 1b98d2235f..ae088dd63c 100644
--- a/util.c
+++ b/util.c
@@ -2240,19 +2240,6 @@ vsprintf(char *dest, const char *pat, void *args)
 	    return n;						\
 	}
 
-/*
- * If we just can't do it...
- */
-
-#define NOT_AVAIL(name,type)                                    \
-        type                                                    \
-        name (type n)                                           \
-        {                                                       \
-            Perl_croak_nocontext(#name "() not available");     \
-            return n; /* not reached */                         \
-        }
-
-
 #if !defined(htovs)
 HTOLE(htovs,short)
 #endif
@@ -2266,132 +2253,6 @@ LETOH(vtohs,short)
 LETOH(vtohl,long)
 #endif
 
-#ifdef PERL_NEED_MY_HTOLE16
-# if U16SIZE == 2
-HTOLE(Perl_my_htole16,U16)
-# else
-NOT_AVAIL(Perl_my_htole16,U16)
-# endif
-#endif
-#ifdef PERL_NEED_MY_LETOH16
-# if U16SIZE == 2
-LETOH(Perl_my_letoh16,U16)
-# else
-NOT_AVAIL(Perl_my_letoh16,U16)
-# endif
-#endif
-#ifdef PERL_NEED_MY_HTOBE16
-# if U16SIZE == 2
-HTOBE(Perl_my_htobe16,U16)
-# else
-NOT_AVAIL(Perl_my_htobe16,U16)
-# endif
-#endif
-#ifdef PERL_NEED_MY_BETOH16
-# if U16SIZE == 2
-BETOH(Perl_my_betoh16,U16)
-# else
-NOT_AVAIL(Perl_my_betoh16,U16)
-# endif
-#endif
-
-#ifdef PERL_NEED_MY_HTOLE32
-# if U32SIZE == 4
-HTOLE(Perl_my_htole32,U32)
-# else
-NOT_AVAIL(Perl_my_htole32,U32)
-# endif
-#endif
-#ifdef PERL_NEED_MY_LETOH32
-# if U32SIZE == 4
-LETOH(Perl_my_letoh32,U32)
-# else
-NOT_AVAIL(Perl_my_letoh32,U32)
-# endif
-#endif
-#ifdef PERL_NEED_MY_HTOBE32
-# if U32SIZE == 4
-HTOBE(Perl_my_htobe32,U32)
-# else
-NOT_AVAIL(Perl_my_htobe32,U32)
-# endif
-#endif
-#ifdef PERL_NEED_MY_BETOH32
-# if U32SIZE == 4
-BETOH(Perl_my_betoh32,U32)
-# else
-NOT_AVAIL(Perl_my_betoh32,U32)
-# endif
-#endif
-
-#ifdef PERL_NEED_MY_HTOLE64
-# if U64SIZE == 8
-HTOLE(Perl_my_htole64,U64)
-# else
-NOT_AVAIL(Perl_my_htole64,U64)
-# endif
-#endif
-#ifdef PERL_NEED_MY_LETOH64
-# if U64SIZE == 8
-LETOH(Perl_my_letoh64,U64)
-# else
-NOT_AVAIL(Perl_my_letoh64,U64)
-# endif
-#endif
-#ifdef PERL_NEED_MY_HTOBE64
-# if U64SIZE == 8
-HTOBE(Perl_my_htobe64,U64)
-# else
-NOT_AVAIL(Perl_my_htobe64,U64)
-# endif
-#endif
-#ifdef PERL_NEED_MY_BETOH64
-# if U64SIZE == 8
-BETOH(Perl_my_betoh64,U64)
-# else
-NOT_AVAIL(Perl_my_betoh64,U64)
-# endif
-#endif
-
-#ifdef PERL_NEED_MY_HTOLES
-HTOLE(Perl_my_htoles,short)
-#endif
-#ifdef PERL_NEED_MY_LETOHS
-LETOH(Perl_my_letohs,short)
-#endif
-#ifdef PERL_NEED_MY_HTOBES
-HTOBE(Perl_my_htobes,short)
-#endif
-#ifdef PERL_NEED_MY_BETOHS
-BETOH(Perl_my_betohs,short)
-#endif
-
-#ifdef PERL_NEED_MY_HTOLEI
-HTOLE(Perl_my_htolei,int)
-#endif
-#ifdef PERL_NEED_MY_LETOHI
-LETOH(Perl_my_letohi,int)
-#endif
-#ifdef PERL_NEED_MY_HTOBEI
-HTOBE(Perl_my_htobei,int)
-#endif
-#ifdef PERL_NEED_MY_BETOHI
-BETOH(Perl_my_betohi,int)
-#endif
-
-#ifdef PERL_NEED_MY_HTOLEL
-HTOLE(Perl_my_htolel,long)
-#endif
-#ifdef PERL_NEED_MY_LETOHL
-LETOH(Perl_my_letohl,long)
-#endif
-#ifdef PERL_NEED_MY_HTOBEL
-HTOBE(Perl_my_htobel,long)
-#endif
-#ifdef PERL_NEED_MY_BETOHL
-BETOH(Perl_my_betohl,long)
-#endif
-
 void
 Perl_my_swabn(void *ptr, int n)
 {