aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2012-05-19 01:49:08 -0700
committerPaul Eggert2012-05-19 01:49:08 -0700
commit003fdae20108225e6993e987a46b095765c151f0 (patch)
tree95bd9fae0763d4fbdc7743c1baa83ef2038fb64c
parente39b98063324ef3405e1c63ccc3bb0ba8fea7fd7 (diff)
downloademacs-003fdae20108225e6993e987a46b095765c151f0.tar.gz
emacs-003fdae20108225e6993e987a46b095765c151f0.zip
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 c1dfe02c0ee..c31ab562f35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
12012-05-19 Paul Eggert <eggert@cs.ucla.edu>
2
3 * configure.in (machine): Do not set to 'vax', since src/m/vax.h
4 is being removed.
5 (AC_CHECK_FUNCS): Remove ftime.
6
12012-05-19 Glenn Morris <rgm@gnu.org> 72012-05-19 Glenn Morris <rgm@gnu.org>
2 8
3 * Makefile.in (install-arch-indep): Remove unneeded subshell. 9 * Makefile.in (install-arch-indep): Remove unneeded subshell.
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index c5f8c7ab31f..8310d0d96cc 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -120,7 +120,6 @@ HAVE_FMOD
120HAVE_FPATHCONF 120HAVE_FPATHCONF
121HAVE_FREXP 121HAVE_FREXP
122HAVE_FSYNC 122HAVE_FSYNC
123HAVE_FTIME
124HAVE_GETCWD 123HAVE_GETCWD
125HAVE_GETDOMAINNAME 124HAVE_GETDOMAINNAME
126HAVE_GETHOSTNAME 125HAVE_GETHOSTNAME
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 01f10f4aea5..deb83a96b50 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12012-05-19 Paul Eggert <eggert@cs.ucla.edu>
2
3 * CPP-DEFINES (HAVE_FTIME): Remove.
4
12012-05-02 Glenn Morris <rgm@gnu.org> 52012-05-02 Glenn Morris <rgm@gnu.org>
2 6
3 * bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit". 7 * bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".
diff --git a/configure.in b/configure.in
index 1599a036096..4aa28d82e56 100644
--- a/configure.in
+++ b/configure.in
@@ -466,7 +466,6 @@ case "${canonical}" in
466 m68k-*) machine=m68k ;; 466 m68k-*) machine=m68k ;;
467 powerpc-*) machine=macppc ;; 467 powerpc-*) machine=macppc ;;
468 sparc*-) machine=sparc ;; 468 sparc*-) machine=sparc ;;
469 vax-*) machine=vax ;;
470 esac 469 esac
471 ;; 470 ;;
472 471
@@ -479,7 +478,6 @@ case "${canonical}" in
479 i386-*) machine=intel386 ;; 478 i386-*) machine=intel386 ;;
480 powerpc-*) machine=macppc ;; 479 powerpc-*) machine=macppc ;;
481 sparc*) machine=sparc ;; 480 sparc*) machine=sparc ;;
482 vax-*) machine=vax ;;
483 esac 481 esac
484 ;; 482 ;;
485 483
@@ -2777,7 +2775,7 @@ AC_SUBST(BLESSMAIL_TARGET)
2777 2775
2778AC_CHECK_FUNCS(gethostname getdomainname \ 2776AC_CHECK_FUNCS(gethostname getdomainname \
2779rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \ 2777rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \
2780random lrand48 logb frexp fmod rint cbrt ftime setsid \ 2778random lrand48 logb frexp fmod rint cbrt setsid \
2781strerror fpathconf select euidaccess getpagesize tzset setlocale \ 2779strerror fpathconf select euidaccess getpagesize tzset setlocale \
2782utimes getrlimit setrlimit setpgid getcwd getwd shutdown getaddrinfo \ 2780utimes getrlimit setrlimit setpgid getcwd getwd shutdown getaddrinfo \
2783__fpending mblen mbrlen mbsinit strsignal setitimer ualarm \ 2781__fpending mblen mbrlen mbsinit strsignal setitimer ualarm \
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 0374a3df0f5..22f7bc1d5ea 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
12012-05-19 Paul Eggert <eggert@cs.ucla.edu>
2
3 * config.nt (HAVE_FTIME): Remove undef; not needed.
4
12012-05-01 Glenn Morris <rgm@gnu.org> 52012-05-01 Glenn Morris <rgm@gnu.org>
2 6
3 * config.nt (HAVE_LIBNCURSES): Remove undef; not needed. 7 * config.nt (HAVE_LIBNCURSES): Remove undef; not needed.
diff --git a/nt/config.nt b/nt/config.nt
index 8b819af5cac..0ae14c93d94 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/>. */
221#undef HAVE_FMOD 221#undef HAVE_FMOD
222#undef HAVE_RINT 222#undef HAVE_RINT
223#undef HAVE_CBRT 223#undef HAVE_CBRT
224#undef HAVE_FTIME
225#undef HAVE_RES_INIT /* For -lresolv on Suns. */ 224#undef HAVE_RES_INIT /* For -lresolv on Suns. */
226#undef HAVE_SETSID 225#undef HAVE_SETSID
227#undef HAVE_FPATHCONF 226#undef HAVE_FPATHCONF
diff --git a/src/ChangeLog b/src/ChangeLog
index b3614db2d55..4e648223497 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-05-19 Paul Eggert <eggert@cs.ucla.edu>
2
3 * m/vax.h: Remove; no longer needed since HAVE_FTIME is being removed.
4 * s/ms-w32.h (HAVE_FTIME): Remove; not needed.
5
12012-05-18 Eli Zaretskii <eliz@gnu.org> 62012-05-18 Eli Zaretskii <eliz@gnu.org>
2 7
3 Fix compilation with -DGLYPH_DEBUG=1 on MS-Windows. 8 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 e4bed4090b9..00000000000
--- a/src/m/vax.h
+++ /dev/null
@@ -1,23 +0,0 @@
1/* machine description file for vax.
2
3Copyright (C) 1985-1986, 2001-2012 Free Software Foundation, Inc.
4
5This file is part of GNU Emacs.
6
7GNU Emacs is free software: you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by
9the Free Software Foundation, either version 3 of the License, or
10(at your option) any later version.
11
12GNU Emacs is distributed in the hope that it will be useful,
13but WITHOUT ANY WARRANTY; without even the implied warranty of
14MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15GNU General Public License for more details.
16
17You should have received a copy of the GNU General Public License
18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19
20
21/* #define vax -- appears to be done automatically */
22
23#define HAVE_FTIME
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index e89ecb05931..815ab9101f4 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -147,7 +147,6 @@ struct sigaction {
147#define HAVE_FMOD 1 147#define HAVE_FMOD 1
148#undef HAVE_RINT 148#undef HAVE_RINT
149#undef HAVE_CBRT 149#undef HAVE_CBRT
150#define HAVE_FTIME 1
151#undef HAVE_RES_INIT /* For -lresolv on Suns. */ 150#undef HAVE_RES_INIT /* For -lresolv on Suns. */
152#undef HAVE_SETSID 151#undef HAVE_SETSID
153#undef HAVE_FPATHCONF 152#undef HAVE_FPATHCONF