aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorJuanma Barranquero2012-09-29 19:06:28 +0200
committerJuanma Barranquero2012-09-29 19:06:28 +0200
commitcd155987b5ac2f9d7ce2ba72ba31e5ad8fae2fd2 (patch)
tree4b5015d9c79aaa06c11d08ae99249f2d8b4bca45 /nt
parente7c1b6ef850e7b4d021fabf4a922010781ed05bd (diff)
downloademacs-cd155987b5ac2f9d7ce2ba72ba31e5ad8fae2fd2.tar.gz
emacs-cd155987b5ac2f9d7ce2ba72ba31e5ad8fae2fd2.zip
nt/config.nt: Sync with autogen/config.in
(HAVE_TIMER_SETTIME): New macro.
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog5
-rw-r--r--nt/config.nt3
2 files changed, 8 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 9f7b4df2e81..d615151310e 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
12012-09-29 Juanma Barranquero <lekktu@gmail.com>
2
3 * config.nt: Sync with autogen/config.in
4 (HAVE_TIMER_SETTIME): New macro.
5
12012-09-23 Eli Zaretskii <eliz@gnu.org> 62012-09-23 Eli Zaretskii <eliz@gnu.org>
2 7
3 * inc/ms-w32.h (emacs_raise): Redefine to invoke emacs_abort. 8 * inc/ms-w32.h (emacs_raise): Redefine to invoke emacs_abort.
diff --git a/nt/config.nt b/nt/config.nt
index 23b33731a36..f8ba4ff9c6c 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -968,6 +968,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
968/* Define to 1 if you have the tiff library (-ltiff). */ 968/* Define to 1 if you have the tiff library (-ltiff). */
969#undef HAVE_TIFF 969#undef HAVE_TIFF
970 970
971/* Define to 1 if you have the `timer_settime' function. */
972#undef HAVE_TIMER_SETTIME
973
971/* Define if struct tm has the tm_gmtoff member. */ 974/* Define if struct tm has the tm_gmtoff member. */
972#undef HAVE_TM_GMTOFF 975#undef HAVE_TM_GMTOFF
973 976