diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-08-04 18:43:10 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-08-04 18:43:10 +0300 |
| commit | 484ab23924d39b3e26d54074fd659633e1660ef4 (patch) | |
| tree | 804eac8d1a95adc545e40c1fa3268898771aaa59 | |
| parent | 63f5c6c20d393e05d517c5c02155d03694c41291 (diff) | |
| download | emacs-484ab23924d39b3e26d54074fd659633e1660ef4.tar.gz emacs-484ab23924d39b3e26d54074fd659633e1660ef4.tar.bz2 emacs-484ab23924d39b3e26d54074fd659633e1660ef4.zip | |
Minor fix of the last commit.
| -rw-r--r-- | nt/ChangeLog | 1 | ||||
| -rw-r--r-- | nt/inc/ms-w32.h | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/w32.c | 1 |
4 files changed, 2 insertions, 3 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 23c0c74b6f1..8ed5caa4aab 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -4,6 +4,7 @@ "yes". * inc/ms-w32.h (mkostemp): Declare prototype. + (mktemp): Don't redirect to sys_mktemp. * config.nt (HAVE_MKOSTEMP): Define to 1. (Bug#15015) diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index f01f254d81c..e670079eb35 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -207,8 +207,6 @@ extern struct tm * sys_localtime (const time_t *); #define link sys_link #define localtime sys_localtime #define mkdir sys_mkdir -#undef mktemp -#define mktemp sys_mktemp #undef open #define open sys_open #undef read diff --git a/src/ChangeLog b/src/ChangeLog index 0fe6b4e6ce3..c29c4c8da59 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -3,6 +3,7 @@ * w32.c (mkostemp): New function. (mktemp): Remove, no longer used. Most of the code reused in mkostemp. (Bug#15015) + (mktemp): Don't undef. 2013-08-04 Dmitry Antipov <dmantipov@yandex.ru> diff --git a/src/w32.c b/src/w32.c index af42c6f39c2..bb2f0acd99a 100644 --- a/src/w32.c +++ b/src/w32.c @@ -47,7 +47,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #undef fopen #undef link #undef mkdir -#undef mktemp #undef open #undef rename #undef rmdir |