Re: textutils-2.0, rare build problems

[Bruno Haible]

Werner Almesberger and Jim Meyering write:

> |  - lib/memcoll.c should include sys/types.h for size_t

Or stdlib.h.

> |  - intl/localealias.c #defines memcpy using bcopy, then uses return value
> |    of memcpy later on (lines 336 and 340), although bcopy is void
> 
> I'm forwarding this to the guys who maintain gettext
> (the package from which the intl directory comes).

Thanks Werner. The following patch is already in gettext CVS since
last month.

Bruno


2000-10-12  Bruno Haible  <address@hidden>

        * localealias.c (memcpy): Return first argument, just like the real
        memcpy function does.
        * bindtextdom.c (memcpy): Likewise.
        * finddomain.c (memcpy): Likewise.
        * l10nflist.c (memcpy): Likewise.
        * textdomain.c (memcpy): Likewise.
        From Paul Eggert <address@hidden>.

*** localealias.c       2000/06/16 18:11:29     1.2
--- localealias.c       2000/10/12 21:26:25     1.3
***************
*** 63,69 ****
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
  # endif
  #endif
  #if !HAVE_STRCHR && !defined _LIBC
--- 63,69 ----
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
  # endif
  #endif
  #if !HAVE_STRCHR && !defined _LIBC
*** bindtextdom.c       2000/09/18 20:24:33     1.4
--- bindtextdom.c       2000/10/12 21:26:25     1.5
***************
*** 34,40 ****
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
  # endif
  #endif
  
--- 34,40 ----
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
  # endif
  #endif
  
*** finddomain.c        2000/06/16 18:11:29     1.2
--- finddomain.c        2000/10/12 21:33:30     1.4
***************
*** 40,46 ****
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
  # endif
  #endif
  
--- 38,44 ----
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
  # endif
  #endif
  
*** l10nflist.c 2000/06/16 18:11:29     1.2
--- l10nflist.c 2000/10/12 21:26:25     1.3
***************
*** 32,38 ****
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
  # endif
  #endif
  #if !HAVE_STRCHR && !defined _LIBC
--- 32,38 ----
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
  # endif
  #endif
  #if !HAVE_STRCHR && !defined _LIBC
*** textdomain.c        2000/09/18 20:24:33     1.3
--- textdomain.c        2000/10/12 21:26:25     1.4
***************
*** 28,34 ****
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
  # endif
  #endif
  
--- 28,34 ----
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
  # endif
  #endif