* buildsym.c (start_subfile): Properly cast sentinel in concat

	call.
	* cp-name-parser.y: Include "config.h".
	* xml-tdesc.c (fetch_xml_from_file): Properly cast sentinel in
	concat call.
	* gdb_select.h: Include sys/time.h if sys/select.h is not
	available.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ffcbe3cf24fdfa0021d4635f6dba74535b57b128..60dac5219e82240639e21752a58516bfd916716a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-09  Pedro Alves  <pedro@codesourcery.com>
+
+       * buildsym.c (start_subfile): Properly cast sentinel in concat
+       call.
+       * cp-name-parser.y: Include "config.h".
+       * xml-tdesc.c (fetch_xml_from_file): Properly cast sentinel in
+       concat call.
+       * gdb_select.h: Include sys/time.h if sys/select.h is not
+       available.
+
 2008-08-09  Pedro Alves  <pedro@codesourcery.com>
 
        * go32-nat.c: Include "gdbthread.h".

diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index f3850a2fa4225cbfd89cde59bb255434520d5ec7..e8bf973f810d6ae02d37b7bbed90f51e4574de49 100644 (file)
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -547,7 +547,7 @@ start_subfile (char *name, char *dirname)
          && !IS_ABSOLUTE_PATH (subfile->name)
          && subfile->dirname != NULL)
        subfile_name = concat (subfile->dirname, SLASH_STRING,
-                              subfile->name, NULL);
+                              subfile->name, (char *) NULL);
       else
        subfile_name = subfile->name;
 

diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y
index 18c959e13b15b2eed909f39ee517e2759daaaf2b..1cfbcfbce835d690da5224045d9ed0ae30882759 100644 (file)
--- a/gdb/cp-name-parser.y
+++ b/gdb/cp-name-parser.y
@@ -36,6 +36,7 @@ Boston, MA 02110-1301, USA.  */
 #include <unistd.h>
 #include <string.h>
 
+#include "config.h"
 #include "safe-ctype.h"
 #include "libiberty.h"
 #include "demangle.h"

diff --git a/gdb/gdb_select.h b/gdb/gdb_select.h
index 5bcdcf3016a22c7ca6f105cb678c868d14fa55a5..407ec9ab484c6c78f9ff4ed5057bf282dedc555b 100644 (file)
--- a/gdb/gdb_select.h
+++ b/gdb/gdb_select.h
@@ -22,6 +22,8 @@
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
+#else
+#include <sys/time.h>
 #endif
 
 #ifdef USE_WIN32API

diff --git a/gdb/xml-tdesc.c b/gdb/xml-tdesc.c
index e1aefd17addab47372533d97e07fac2ab05d3f28..d66c0e3e6b06bb01c864fceb07b56ea99d91ceb0 100644 (file)
--- a/gdb/xml-tdesc.c
+++ b/gdb/xml-tdesc.c
@@ -443,7 +443,7 @@ fetch_xml_from_file (const char *filename, void *baton)
 
   if (dirname && *dirname)
     {
-      char *fullname = concat (dirname, "/", filename, NULL);
+      char *fullname = concat (dirname, "/", filename, (char *) NULL);
       if (fullname == NULL)
        nomem (0);
       file = fopen (fullname, FOPEN_RT);