diff --git a/expat/ConfigureChecks.cmake b/expat/ConfigureChecks.cmake index 818d2492..1e245da0 100644 --- a/expat/ConfigureChecks.cmake +++ b/expat/ConfigureChecks.cmake @@ -18,8 +18,6 @@ check_include_file("sys/types.h" HAVE_SYS_TYPES_H) check_include_file("unistd.h" HAVE_UNISTD_H) check_symbol_exists("getpagesize" "unistd.h" HAVE_GETPAGESIZE) -check_symbol_exists("bcopy" "strings.h" HAVE_BCOPY) -check_symbol_exists("memmove" "string.h" HAVE_MEMMOVE) check_symbol_exists("mmap" "sys/mman.h" HAVE_MMAP) check_symbol_exists("getrandom" "sys/random.h" HAVE_GETRANDOM) diff --git a/expat/configure.ac b/expat/configure.ac index 12f66422..07b170d2 100644 --- a/expat/configure.ac +++ b/expat/configure.ac @@ -106,8 +106,6 @@ AC_C_BIGENDIAN_CROSS AC_C_CONST AC_TYPE_SIZE_T -AC_CHECK_FUNCS(memmove bcopy) - AC_ARG_WITH([xmlwf], [ AS_HELP_STRING([--without-xmlwf], [do not build xmlwf])], [], [with_xmlwf=yes]) diff --git a/expat/expat_config.h.cmake b/expat/expat_config.h.cmake index 3e23f487..f1f51440 100644 --- a/expat/expat_config.h.cmake +++ b/expat/expat_config.h.cmake @@ -9,9 +9,6 @@ /* Define to 1 if you have the `arc4random_buf' function. */ #cmakedefine HAVE_ARC4RANDOM_BUF -/* Define to 1 if you have the `bcopy' function. */ -#cmakedefine HAVE_BCOPY - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_DLFCN_H @@ -30,9 +27,6 @@ /* Define to 1 if you have the `bsd' library (-lbsd). */ #cmakedefine HAVE_LIBBSD -/* Define to 1 if you have the `memmove' function. */ -#cmakedefine HAVE_MEMMOVE - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_MEMORY_H diff --git a/expat/lib/winconfig.h b/expat/lib/winconfig.h index 17fea468..28a043c6 100644 --- a/expat/lib/winconfig.h +++ b/expat/lib/winconfig.h @@ -53,10 +53,6 @@ /* we will assume all Windows platforms are little endian */ #define BYTEORDER 1234 -/* Windows has memmove() available. */ -#define HAVE_MEMMOVE - - #endif /* !defined(HAVE_EXPAT_CONFIG_H) */ diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index c4f3ffc2..eaefb6f4 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -164,15 +164,6 @@ typedef char ICHAR; /* Do safe (NULL-aware) pointer arithmetic */ #define EXPAT_SAFE_PTR_DIFF(p, q) (((p) && (q)) ? ((p) - (q)) : 0) -/* Handle the case where memmove() doesn't exist. */ -#ifndef HAVE_MEMMOVE -#ifdef HAVE_BCOPY -#define memmove(d,s,l) bcopy((s),(d),(l)) -#else -#error memmove does not exist on this platform, nor is a substitute available -#endif /* HAVE_BCOPY */ -#endif /* HAVE_MEMMOVE */ - #include "internal.h" #include "xmltok.h" #include "xmlrole.h"