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
