aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure10
-rw-r--r--src/config.in26
2 files changed, 21 insertions, 15 deletions
diff --git a/configure b/configure
index 4087bdd366..4be93dd246 100755
--- 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"
@@ -5031,10 +5031,9 @@ 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`
@@ -11270,6 +11269,7 @@ done
+
for ac_func in gethostname getdomainname dup2 \
rename closedir mkdir rmdir sysinfo \
random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \
@@ -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 9a95856373..5ef32f7b26 100644
--- 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 */