CVS commit: src/external/gpl3/gdb/dist/libiberty

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Oct  6 21:49:22 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/libiberty: make-temp-file.c

Log Message:
Undo local patch having no impact

/tmp is picked from P_tmpdir earlier.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gdb/dist/libiberty/make-temp-file.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/dist/libiberty/make-temp-file.c
diff -u src/external/gpl3/gdb/dist/libiberty/make-temp-file.c:1.6 src/external/gpl3/gdb/dist/libiberty/make-temp-file.c:1.7
--- src/external/gpl3/gdb/dist/libiberty/make-temp-file.c:1.6	Tue Sep 15 02:05:28 2020
+++ src/external/gpl3/gdb/dist/libiberty/make-temp-file.c	Tue Oct  6 21:49:22 2020
@@ -129,10 +129,10 @@ choose_tmpdir (void)
 	base = try_dir (P_tmpdir, base);
 #endif
 
-  /* Try /tmp, /var/tmp, then /usr/tmp.  */
-  base = try_dir (tmp, base);
+  /* Try /var/tmp, /usr/tmp, then /tmp.  */
   base = try_dir (vartmp, base);
   base = try_dir (usrtmp, base);
+  base = try_dir (tmp, base);
   
   /* If all else fails, use the current directory!  */
   if (base == 0)

CVS commit: src/external/gpl3/gdb/dist/libiberty

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Aug 16 09:58:18 UTC 2015

Modified Files:
src/external/gpl3/gdb/dist/libiberty: make-temp-file.c strerror.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gdb/dist/libiberty/make-temp-file.c \
src/external/gpl3/gdb/dist/libiberty/strerror.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/dist/libiberty/make-temp-file.c
diff -u src/external/gpl3/gdb/dist/libiberty/make-temp-file.c:1.2 src/external/gpl3/gdb/dist/libiberty/make-temp-file.c:1.3
--- src/external/gpl3/gdb/dist/libiberty/make-temp-file.c:1.2	Mon Aug 10 11:45:40 2015
+++ src/external/gpl3/gdb/dist/libiberty/make-temp-file.c	Sun Aug 16 05:58:18 2015
@@ -93,7 +93,7 @@ static char *memoized_tmpdir;
 
 /*
 
-@deftypefn Replacement char* choose_tmpdir ()
+@deftypefn Replacement const char* choose_tmpdir ()
 
 Returns a pointer to a directory path suitable for creating temporary
 files in.
@@ -102,7 +102,7 @@ files in.
 
 */
 
-char *
+const char *
 choose_tmpdir (void)
 {
   if (!memoized_tmpdir)
Index: src/external/gpl3/gdb/dist/libiberty/strerror.c
diff -u src/external/gpl3/gdb/dist/libiberty/strerror.c:1.2 src/external/gpl3/gdb/dist/libiberty/strerror.c:1.3
--- src/external/gpl3/gdb/dist/libiberty/strerror.c:1.2	Sun Sep 25 12:30:26 2011
+++ src/external/gpl3/gdb/dist/libiberty/strerror.c	Sun Aug 16 05:58:18 2015
@@ -469,8 +469,13 @@ static const char **sys_errlist;
 
 #else
 
+
+#ifndef sys_nerr
 extern int sys_nerr;
+#endif
+#ifndef sys_errlist
 extern char *sys_errlist[];
+#endif
 
 #endif