summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-05-19 01:49:08 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-05-19 01:49:08 -0700
commit003fdae20108225e6993e987a46b095765c151f0 (patch)
tree95bd9fae0763d4fbdc7743c1baa83ef2038fb64c
parente39b98063324ef3405e1c63ccc3bb0ba8fea7fd7 (diff)
Remove no-longer-used macro HAVE_FTIME.
* configure.in (machine): Do not set to 'vax', since src/m/vax.h is being removed. (AC_CHECK_FUNCS): Remove ftime. * admin/CPP-DEFINES (HAVE_FTIME): Remove. * nt/config.nt (HAVE_FTIME): Remove undef; not needed. * src/m/vax.h: Remove; no longer needed since HAVE_FTIME is being removed. * src/s/ms-w32.h (HAVE_FTIME): Remove; not needed.
-rw-r--r--ChangeLog6
-rw-r--r--admin/CPP-DEFINES1
-rw-r--r--admin/ChangeLog4
-rw-r--r--configure.in4
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/config.nt1
-rw-r--r--src/ChangeLog5
-rw-r--r--src/m/vax.h23
-rw-r--r--src/s/ms-w32.h1
9 files changed, 20 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index c1dfe02c0e..c31ab562f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-19 Paul Eggert <eggert@cs.ucla.edu>
+
+ * configure.in (machine): Do not set to 'vax', since src/m/vax.h
+ is being removed.
+ (AC_CHECK_FUNCS): Remove ftime.
+
2012-05-19 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-arch-indep): Remove unneeded subshell.
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index c5f8c7ab31..8310d0d96c 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -120,7 +120,6 @@ HAVE_FMOD
HAVE_FPATHCONF
HAVE_FREXP
HAVE_FSYNC
-HAVE_FTIME
HAVE_GETCWD
HAVE_GETDOMAINNAME
HAVE_GETHOSTNAME
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 01f10f4aea..deb83a96b5 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-19 Paul Eggert <eggert@cs.ucla.edu>
+
+ * CPP-DEFINES (HAVE_FTIME): Remove.
+
2012-05-02 Glenn Morris <rgm@gnu.org>
* bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".
diff --git a/configure.in b/configure.in
index 1599a03609..4aa28d82e5 100644
--- a/configure.in
+++ b/configure.in
@@ -466,7 +466,6 @@ case "${canonical}" in
m68k-*) machine=m68k ;;
powerpc-*) machine=macppc ;;
sparc*-) machine=sparc ;;
- vax-*) machine=vax ;;
esac
;;
@@ -479,7 +478,6 @@ case "${canonical}" in
i386-*) machine=intel386 ;;
powerpc-*) machine=macppc ;;
sparc*) machine=sparc ;;
- vax-*) machine=vax ;;
esac
;;
@@ -2777,7 +2775,7 @@ AC_SUBST(BLESSMAIL_TARGET)
AC_CHECK_FUNCS(gethostname getdomainname \
rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \
-random lrand48 logb frexp fmod rint cbrt ftime setsid \
+random lrand48 logb frexp fmod rint cbrt setsid \
strerror fpathconf select euidaccess getpagesize tzset setlocale \
utimes getrlimit setrlimit setpgid getcwd getwd shutdown getaddrinfo \
__fpending mblen mbrlen mbsinit strsignal setitimer ualarm \
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 0374a3df0f..22f7bc1d5e 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-19 Paul Eggert <eggert@cs.ucla.edu>
+
+ * config.nt (HAVE_FTIME): Remove undef; not needed.
+
2012-05-01 Glenn Morris <rgm@gnu.org>
* config.nt (HAVE_LIBNCURSES): Remove undef; not needed.
diff --git a/nt/config.nt b/nt/config.nt
index 8b819af5ca..0ae14c93d9 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -221,7 +221,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#undef HAVE_FMOD
#undef HAVE_RINT
#undef HAVE_CBRT
-#undef HAVE_FTIME
#undef HAVE_RES_INIT /* For -lresolv on Suns. */
#undef HAVE_SETSID
#undef HAVE_FPATHCONF
diff --git a/src/ChangeLog b/src/ChangeLog
index b3614db2d5..4e64822349 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-19 Paul Eggert <eggert@cs.ucla.edu>
+
+ * m/vax.h: Remove; no longer needed since HAVE_FTIME is being removed.
+ * s/ms-w32.h (HAVE_FTIME): Remove; not needed.
+
2012-05-18 Eli Zaretskii <eliz@gnu.org>
Fix compilation with -DGLYPH_DEBUG=1 on MS-Windows.
diff --git a/src/m/vax.h b/src/m/vax.h
deleted file mode 100644
index e4bed4090b..0000000000
--- a/src/m/vax.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* machine description file for vax.
-
-Copyright (C) 1985-1986, 2001-2012 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-
-/* #define vax -- appears to be done automatically */
-
-#define HAVE_FTIME
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index e89ecb0593..815ab9101f 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -147,7 +147,6 @@ struct sigaction {
#define HAVE_FMOD 1
#undef HAVE_RINT
#undef HAVE_CBRT
-#define HAVE_FTIME 1
#undef HAVE_RES_INIT /* For -lresolv on Suns. */
#undef HAVE_SETSID
#undef HAVE_FPATHCONF