This is the mail archive of the libc-alpha@sources.redhat.com mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

libintl patches (1)



Here is a patch for libintl portability. Only needed for the gettext
package. Has no effect inside glibc.

2000-10-12  Bruno Haible  <haible@clisp.cons.org>

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

diff -c3 -r glibc-cvs/intl/localealias.c glibc-cvs/intlnew/localealias.c
*** glibc-cvs/intl/localealias.c	Sat Oct 21 23:57:05 2000
--- glibc-cvs/intlnew/localealias.c	Wed Jan  3 19:25:42 2001
***************
*** 64,70 ****
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
  # endif
  #endif
  #if !HAVE_STRCHR && !defined _LIBC
--- 64,70 ----
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
  # endif
  #endif
  #if !HAVE_STRCHR && !defined _LIBC
diff -c3 -r glibc-cvs/intl/bindtextdom.c glibc-cvs/intlnew/bindtextdom.c
*** glibc-cvs/intl/bindtextdom.c	Fri Sep 29 22:27:44 2000
--- glibc-cvs/intlnew/bindtextdom.c	Wed Jan  3 19:25:42 2001
***************
*** 35,41 ****
  #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
  
diff -c3 -r glibc-cvs/intl/finddomain.c glibc-cvs/intlnew/finddomain.c
*** glibc-cvs/intl/finddomain.c	Thu May  4 12:53:41 2000
--- glibc-cvs/intlnew/finddomain.c	Wed Jan  3 19:25:42 2001
***************
*** 41,47 ****
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
  # endif
  #endif
  
--- 39,45 ----
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
  # endif
  #endif
  
diff -c3 -r glibc-cvs/intl/l10nflist.c glibc-cvs/intlnew/l10nflist.c
*** glibc-cvs/intl/l10nflist.c	Thu May  4 12:53:41 2000
--- glibc-cvs/intlnew/l10nflist.c	Wed Jan  3 19:25:42 2001
***************
*** 33,39 ****
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
  # endif
  #endif
  #if !HAVE_STRCHR && !defined _LIBC
--- 33,39 ----
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
  # endif
  #endif
  #if !HAVE_STRCHR && !defined _LIBC
diff -c3 -r glibc-cvs/intl/textdomain.c glibc-cvs/intlnew/textdomain.c
*** glibc-cvs/intl/textdomain.c	Fri Sep 29 22:27:44 2000
--- glibc-cvs/intlnew/textdomain.c	Wed Jan  3 19:25:42 2001
***************
*** 29,35 ****
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
  # endif
  #endif
  
--- 29,35 ----
  #else
  # include <strings.h>
  # ifndef memcpy
! #  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
  # endif
  #endif
  

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]