merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 553d17c..82547e2 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-29  Douglas B Rupp  <rupp@gnat.com>
+
+       * mkstemps.c (mkstemps) [VMS]: Remove special open option. Update
+       copyright.
+
 2004-04-26  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
 
        * configure.ac (UNSIGNED_64BIT_TYPE): Unquote the definition.

diff --git a/libiberty/mkstemps.c b/libiberty/mkstemps.c
index 1f6600a..94edf78 100644 (file)
--- a/libiberty/mkstemps.c
+++ b/libiberty/mkstemps.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1996, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1996, 1998, 2004 Free Software Foundation, Inc.
    This file is derived from mkstemp.c from the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -121,11 +121,7 @@ mkstemps (template, suffix_len)
       v /= 62;
       XXXXXX[5] = letters[v % 62];
 
-#ifdef VMS
-      fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600, "fop=tmd");
-#else
       fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600);
-#endif
       if (fd >= 0)
        /* The file does not exist.  */
        return fd;