Regenerated.

diff --git a/configure b/configure
index 4087bdd366473311fe686f199e52158d2eda9ae4..4be93dd246765679754dda3a923c16981a2896ed 100755 (executable)
--- a/configure
+++ b/configure
@@ -3397,12 +3397,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
+   '#include <stdlib.h>' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
    'extern "C" void exit (int);' \
-   'void exit (int);' \
-   '#include <stdlib.h>'
+   'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
@@ -5029,12 +5029,11 @@ fi
 
 
 
-
 
 
 for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
   linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
-  termcap.h stdio_ext.h fcntl.h term.h strings.h coff.h pty.h sys/mman.h \
+  termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
   sys/param.h sys/vlimit.h sys/resource.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -11268,6 +11267,7 @@ done
 
 
 
+
 
 
 for ac_func in gethostname getdomainname dup2 \
@@ -11278,7 +11278,7 @@ utimes setrlimit setpgid getcwd getwd shutdown strftime getaddrinfo \
 __fpending mblen mbrlen mbsinit strsignal setitimer ualarm index rindex \
 sendto recvfrom getsockopt setsockopt getsockname getpeername \
 gai_strerror mkstemp getline getdelim mremap memmove fsync bzero \
-memset memcmp memmove
+memset memcmp memmove difftime
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5

diff --git a/src/config.in b/src/config.in
index 9a9585637375a235d592b652c5fe8b5b0f169472..5ef32f7b2616950df02d255536c4157eee95cb20 100644 (file)
--- a/src/config.in
+++ b/src/config.in
@@ -124,6 +124,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if dynamic ptys are supported. */
 #undef HAVE_DEV_PTMX
 
+/* Define to 1 if you have the `difftime' function. */
+#undef HAVE_DIFFTIME
+
 /* Define to 1 if you have the `dup2' function. */
 #undef HAVE_DUP2
 
@@ -1010,17 +1013,20 @@ 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
+#  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 */
 
 #endif /* EMACS_CONFIG_H */