Retract #19667, #19660, #19659, #19658, #19657, #19656,

#19655, #19418; File::Temp no more used internally.
Some parts of these will be salvaged later.

p4raw-id: //depot/perl@19670

2 files changed, 3 insertions, 13 deletions

diff --git a/win32/win32.c b/win32/win32.c
index 083e98e797..b022e0cfc0 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2615,8 +2615,8 @@ win32_rewind(FILE *pf)
     return;
 }
 
-DllExport int
-win32_tmpfd(void)
+DllExport FILE*
+win32_tmpfile(void)
 {
     dTHX;
     char prefix[MAX_PATH+1];
@@ -2640,20 +2640,11 @@ win32_tmpfd(void)
 #endif
 		    DEBUG_p(PerlIO_printf(Perl_debug_log,
 					  "Created tmpfile=%s\n",filename));
-		    return fd;
+		    return fdopen(fd, "w+b");
 		}
 	    }
 	}
     }
-    return -1;
-}
-
-DllExport FILE*
-win32_tmpfile(void)
-{
-    int fd = win32_tmpfd();
-    if (fd >= 0)
-	return win32_fdopen(fd, "w+b");
     return NULL;
 }
 
diff --git a/win32/win32iop.h b/win32/win32iop.h
index 1683e97e54..e835b2eea6 100644
--- a/win32/win32iop.h
+++ b/win32/win32iop.h
@@ -67,7 +67,6 @@ DllExport  int		win32_fseek(FILE *pf,Off_t offset,int origin);
 DllExport  int		win32_fgetpos(FILE *pf,fpos_t *p);
 DllExport  int		win32_fsetpos(FILE *pf,const fpos_t *p);
 DllExport  void		win32_rewind(FILE *pf);
-DllExport  int		win32_tmpfd(void);
 DllExport  FILE*	win32_tmpfile(void);
 DllExport  void		win32_abort(void);
 DllExport  int  	win32_fstat(int fd,Stat_t *sbufptr);