Minor fix of the last commit.

484ab239 · Eli Zaretskii · 63f5c6c2 · 484ab239 · 484ab239 · 484ab239
Commit 484ab239 authored Aug 04, 2013 by Eli Zaretskii
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

nt/ChangeLog nt/ChangeLog +1 -0

nt/inc/ms-w32.h nt/inc/ms-w32.h +0 -2

src/ChangeLog src/ChangeLog +1 -0

src/w32.c src/w32.c +0 -1

No files found.
--- 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)


--- 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

--- 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>


--- 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