Revert changes of 2003-03-03 and 2003-05-28.

2 files changed, 15 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index aa2d0b946d9..020dbc12775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-02  Richard M. Stallman  <rms@gnu.org>
+
+        * configure.in: Revert changes of 2003-03-03 and 2003-05-24.
+
 2003-05-24  Andreas Schwab  <schwab@suse.de>
 
         * configure.in (AH_BOTTOM) [MAC_OSX]: Do not redefine bcopy,
@@ -52,8 +56,8 @@
 
 2003-03-03  Rob Browning  <rlb@defaultvalue.org>
 
-        * configure.in: add AC_CHECK_FUNCS for memcmp and memmove.
-        (AH_BOTTOM): switch tests to prefer memcmp, memset, and memmove
+        * configure.in: Add AC_CHECK_FUNCS for memcmp and memmove.
+        (AH_BOTTOM): Switch tests to prefer memcmp, memset, and memmove
         over bzero, bcmp, and bcopy.
 
 2003-02-23  Simon Josefsson  <jas@extundo.com>
diff --git a/configure.in b/configure.in
index ab08f35dabe..a4eb85b220f 100644
--- a/configure.in
+++ b/configure.in
@@ -2854,20 +2854,15 @@ typedef unsigned size_t;
 #  endif
 #endif
 
-/* On Mac OS X, these macros are already defined in precompiled headers.  */
-#ifndef MAC_OSX
-/* avoid deprecated functions */
-#  ifdef HAVE_MEMCPY
-#    define bcopy(a,b,s) memcpy (b,a,s)
-#  endif
-#  ifdef HAVE_MEMSET
-#    define bzero(a,s) memset (a,0,s)
-#  endif
-#  ifdef HAVE_MEMCMP
-#    define BCMP memcmp
-#    define bcmp memcmp
-#  endif
-#endif /* MAC_OSX */
+#ifndef HAVE_BCOPY
+#define bcopy(a,b,s) memcpy (b,a,s)
+#endif
+#ifndef HAVE_BZERO
+#define bzero(a,s) memset (a,0,s)
+#endif
+#ifndef HAVE_BCMP
+#define BCMP memcmp
+#endif
 
 #endif /* EMACS_CONFIG_H */