aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-01-31 22:00:40 +0200
committerEli Zaretskii2011-01-31 22:00:40 +0200
commit8b3c625b7d36dd54bf738eedc60ff7ec15388f29 (patch)
treed81bad444ba3d6b641c9b8a039ccebc950ace294 /src
parent70b0d280eb5cfdf103603fb289064710ae7cd680 (diff)
downloademacs-8b3c625b7d36dd54bf738eedc60ff7ec15388f29.tar.gz
emacs-8b3c625b7d36dd54bf738eedc60ff7ec15388f29.zip
Don't define HAVE_STRFTIME on MS-Windows.
s/ms-w32.h (HAVE_STRFTIME): Don't define.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/s/ms-w32.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 072e74b77f7..7c4401c1c81 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-01-31 Eli Zaretskii <eliz@gnu.org> 12011-01-31 Eli Zaretskii <eliz@gnu.org>
2 2
3 * s/ms-w32.h (HAVE_STRFTIME): Don't define.
4
3 * makefile.w32-in (OBJ2): Remove strftime.$(O). 5 * makefile.w32-in (OBJ2): Remove strftime.$(O).
4 ($(BLD)/strftime.$(O)): Remove prerequisites. 6 ($(BLD)/strftime.$(O)): Remove prerequisites.
5 7
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index d247cf866f9..4c3b84dfe4c 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -159,7 +159,6 @@ struct sigaction {
159#undef HAVE_SETPGID 159#undef HAVE_SETPGID
160#undef HAVE_GETCWD 160#undef HAVE_GETCWD
161#define HAVE_SHUTDOWN 1 161#define HAVE_SHUTDOWN 1
162#define HAVE_STRFTIME 1
163 162
164#define LOCALTIME_CACHE 163#define LOCALTIME_CACHE
165#define HAVE_INET_SOCKETS 1 164#define HAVE_INET_SOCKETS 1