Commit 9bcfe71d by Richard Henderson Committed by Richard Henderson

Makefile.in (STROBJS): Get memmove.o from configure.

        * Makefile.in (STROBJS): Get memmove.o from configure.
        * configure.in (RANLIB): Detect and substitute.
        (memmove): Detect and substitute.
        * memmove.c (memmove): Use size_t.

From-SVN: r34313
parent c74e2214
2000-05-31 Richard Henderson <rth@cygnus.com>
* Makefile.in (STROBJS): Get memmove.o from configure.
* configure.in (RANLIB): Detect and substitute.
(memmove): Detect and substitute.
* memmove.c (memmove): Use size_t.
2000-05-29 Zack Weinberg <zack@wolery.cumb.org>
* concatstr.c, exh.c: Include stdlib.h and string.h.
......
......@@ -81,7 +81,7 @@ PSOBJS = andps.o cardps.o concatps.o copyps.o diffps.o eqps.o ffsetclrps.o \
ffsetps.o flsetclrps.o flsetps.o inbitstr.o inps.o leps.o ltps.o \
neps.o notps.o orps.o setbitps.o setbits.o sliceps.o xorps.o
STROBJS = concatstr.o eqstr.o ltstr.o memmove.o
STROBJS = concatstr.o eqstr.o ltstr.o @MEMMOVE_O@
TIMEOBJS = abstime.o inttime.o waituntil.o remaintime.o convdurrtstime.o \
checkcycle.o
......
......@@ -70,6 +70,11 @@ AC_PROG_CC
test "$AR" || AR=ar
AC_SUBST(AR)
if test "$RANLIB"; then :
AC_SUBST(RANLIB)
else
AC_PROG_RANLIB
fi
AC_PROG_MAKE_SET
dnl Checks for libraries.
......@@ -123,6 +128,10 @@ AC_CHECK_FUNC(atexit,
AC_DEFINE(onexit,on_exit),)])])
else true
fi
AC_CHECK_FUNC(memmove,
MEMMOVE_O='',
MEMMOVE_O=memmove.o)
AC_SUBST(MEMMOVE_O)
# We need multilib support, but only if configuring for the target.
AC_OUTPUT(Makefile,
......
......@@ -26,9 +26,11 @@ Boston, MA 02111-1307, USA. */
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
#include <string.h>
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#ifdef __STDC__
#include <stddef.h>
#else
#define size_t unsigned long
#endif
/*
......@@ -54,7 +56,7 @@ void *
memmove (s1, s2, n)
void *s1;
const void *s2;
unsigned int n;
size_t n;
{
char *sc1 = s1;
const char *sc2 = s2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment