aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2012-03-29 22:06:39 +0200
committerEli Zaretskii2012-03-29 22:06:39 +0200
commit581355cc06ed0800e3e675bfbb2aa00945462f42 (patch)
tree9c689657a8a0e74243d518a142af44115287bfb0
parent6e7a6ec037313ac3fb76134f20ce268324c05518 (diff)
downloademacs-581355cc06ed0800e3e675bfbb2aa00945462f42.tar.gz
emacs-581355cc06ed0800e3e675bfbb2aa00945462f42.zip
Discourage in comments from defining HAVE_GETCWD on MS-Windows.
src/s/ms-w32.h: Discourage from defining HAVE_GETCWD. nt/config.nt: Discourage from defining HAVE_GETCWD.
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/config.nt3
-rw-r--r--src/ChangeLog4
-rw-r--r--src/s/ms-w32.h3
4 files changed, 14 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 5c494578eeb..d0a85a4a319 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
12012-03-29 Eli Zaretskii <eliz@gnu.org>
2
3 * config.nt: Discourage from defining HAVE_GETCWD.
4
12012-03-25 Eli Zaretskii <eliz@gnu.org> 52012-03-25 Eli Zaretskii <eliz@gnu.org>
2 6
3 * makefile.w32-in (install-bin): Don't copy addpm.exe here. Use 7 * makefile.w32-in (install-bin): Don't copy addpm.exe here. Use
diff --git a/nt/config.nt b/nt/config.nt
index 368dd33de29..d095655506e 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -235,6 +235,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
235#undef HAVE_UTIMES 235#undef HAVE_UTIMES
236#undef HAVE_SETRLIMIT 236#undef HAVE_SETRLIMIT
237#undef HAVE_SETPGID 237#undef HAVE_SETPGID
238/* If you think about defining HAVE_GETCWD, don't: the alternative
239 getwd is redefined on w32.c, and does not really return the current
240 directory, to get the desired results elsewhere in Emacs */
238#undef HAVE_GETCWD 241#undef HAVE_GETCWD
239#undef HAVE_SHUTDOWN 242#undef HAVE_SHUTDOWN
240#undef HAVE_STRFTIME 243#undef HAVE_STRFTIME
diff --git a/src/ChangeLog b/src/ChangeLog
index 1c740904eb3..e57b1af1b8b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-03-29 Eli Zaretskii <eliz@gnu.org>
2
3 * s/ms-w32.h: Discourage from defining HAVE_GETCWD.
4
12012-03-28 Stefan Monnier <monnier@iro.umontreal.ca> 52012-03-28 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * keyboard.c (safe_run_hooks_error): Don't unquote strings. 7 * keyboard.c (safe_run_hooks_error): Don't unquote strings.
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 5eed3a177dc..e89ecb05931 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -159,6 +159,9 @@ struct sigaction {
159#undef HAVE_UTIMES 159#undef HAVE_UTIMES
160#undef HAVE_SETRLIMIT 160#undef HAVE_SETRLIMIT
161#undef HAVE_SETPGID 161#undef HAVE_SETPGID
162/* If you think about defining HAVE_GETCWD, don't: the alternative
163 getwd is redefined on w32.c, and does not really return the current
164 directory, to get the desired results elsewhere in Emacs */
162#undef HAVE_GETCWD 165#undef HAVE_GETCWD
163#define HAVE_SHUTDOWN 1 166#define HAVE_SHUTDOWN 1
164 167