merge trunk

2 files changed, 6 insertions, 10 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 8dfb8e2d600..af818babb16 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -79,8 +79,6 @@ USER_FULL_NAME   If defined, overrides the default pw->pw_gecos for getting at t
 
 AIX
 AMPERSAND_FULL_NAME
-BCOPY_DOWNWARD_SAFE
-BCOPY_UPWARD_SAFE
 BITS_PER_EMACS_INT
 BITS_PER_LONG
 BITS_PER_CHAR
@@ -118,7 +116,6 @@ EMACS_UINT
 FILE_SYSTEM_CASE
 FLOAT_CHECK_DOMAIN
 FSCALE
-GAP_USE_BCOPY
 GC_LISP_OBJECT_ALIGNMENT
 GC_MARK_SECONDARY_STACK
 GC_MARK_STACK
@@ -128,8 +125,6 @@ GNU_LIBRARY_PENDING_OUTPUT_COUNT
 GNU_LINUX
 GNU_MALLOC
 HAVE_AIX_SMT_EXP
-HAVE_BCMP
-HAVE_BCOPY
 HAVE_CBRT
 HAVE_CLOSEDIR
 HAVE_DUP2
@@ -191,7 +186,6 @@ HAVE_SYS_TIMEB_H
 HAVE_SYS_TIME_H
 HAVE_TCATTR
 HAVE_TERMIOS_H
-HAVE_TEXT_START
 HAVE_TIMEVAL
 HAVE_TM_ZONE
 HAVE_TZSET
@@ -267,7 +261,6 @@ SYSV_SYSTEM_DIR
 TAB3
 TABDLY
 TERM
-TEXT_START
 THIS_IS_CONFIGURE
 TIME_WITH_SYS_TIME
 TIOCSIGSEND
@@ -319,10 +312,7 @@ _start
 abort
 access
 alloca
-bcmp
-bcopy
 brk
-bzero
 calloc
 chdir
 chmod
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 2b73c72f20e..41a88c57bb6 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-07  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * CPP-DEFINES (BCOPY_DOWNWARD_SAFE, BCOPY_UPWARD_SAFE)
+        (GAP_USE_BCOPY, HAVE_BCMP, HAVE_BCOPY, bcmp, bcopy, bzero):
+        Remove.
+
 2010-06-12  Eli Zaretskii  <eliz@gnu.org>
 
         * unidata/bidimirror.awk: New file.