aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert2012-05-19 01:49:08 -0700
committerPaul Eggert2012-05-19 01:49:08 -0700
commit003fdae20108225e6993e987a46b095765c151f0 (patch)
tree95bd9fae0763d4fbdc7743c1baa83ef2038fb64c /admin
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.
Diffstat (limited to 'admin')
-rw-r--r--admin/CPP-DEFINES1
-rw-r--r--admin/ChangeLog4
2 files changed, 4 insertions, 1 deletions
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".