From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 4 Aug 2013 15:43:10 +0000 (+0300)
Subject: Minor fix of the last commit.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~435
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=484ab23924d39b3e26d54074fd659633e1660ef4;p=emacs.git

Minor fix of the last commit.
---

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