From e6272dcbab62ecd1c4e937a9d4c1a86f240a8014 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Tue, 22 Feb 2000 16:14:35 +0000
Subject: merge with libiberty from egcs 2000-02-22

---
 libiberty/choose-temp.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'libiberty/choose-temp.c')

diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c
index 7aae318f9eb..826d818ed62 100644
--- a/libiberty/choose-temp.c
+++ b/libiberty/choose-temp.c
@@ -19,9 +19,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* This file exports two functions: choose_temp_base and make_temp_file.  */
 
-/* This file lives in at least two places: libiberty and gcc.
-   Don't change one without the other.  */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -51,7 +48,7 @@ Boston, MA 02111-1307, USA.  */
 extern int mkstemps ();
 
 #ifndef IN_GCC
-#if defined (__MSDOS__) || defined (_WIN32)
+#if defined (__MSDOS__) || (defined (_WIN32) && ! defined (__CYGWIN__) && ! defined (_UWIN))
 #define DIR_SEPARATOR '\\'
 #endif
 #endif
@@ -148,7 +145,7 @@ choose_temp_base ()
 
 char *
 make_temp_file (suffix)
-     char *suffix;
+     const char *suffix;
 {
   char *base = 0;
   char *temp_filename;
-- 
cgit v1.2.1