aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero <[email protected]>2003-06-02 19:26:18 +0000
committerJuanma Barranquero <[email protected]>2003-06-02 19:26:18 +0000
commitefd60266f5c1719715230627d61339a6e40ef442 (patch)
treed857237fc52b74df04f6ae3bb9322ecee5d9c9a3
parent5b07197ad97cfdac6af695fac3a5efbf8f8c122a (diff)
Revert changes of 2003-03-03 and 2003-05-28.
-rw-r--r--ChangeLog8
-rw-r--r--configure.in23
2 files changed, 15 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index aa2d0b946d..020dbc1277 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-02 Richard M. Stallman <[email protected]>
+
+ * configure.in: Revert changes of 2003-03-03 and 2003-05-24.
+
2003-05-24 Andreas Schwab <[email protected]>
* configure.in (AH_BOTTOM) [MAC_OSX]: Do not redefine bcopy,
@@ -52,8 +56,8 @@
2003-03-03 Rob Browning <[email protected]>
- * 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 <[email protected]>
diff --git a/configure.in b/configure.in
index ab08f35dab..a4eb85b220 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 */