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.

---
 gdb/buildsym.c       |    2 +-
 gdb/cp-name-parser.y |    1 +
 gdb/gdb_select.h     |    2 ++
 gdb/xml-tdesc.c      |    2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

Index: src/gdb/buildsym.c
===================================================================
--- src.orig/gdb/buildsym.c	2008-08-10 19:36:43.000000000 +0100
+++ src/gdb/buildsym.c	2008-08-10 19:37:09.000000000 +0100
@@ -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;
 
Index: src/gdb/cp-name-parser.y
===================================================================
--- src.orig/gdb/cp-name-parser.y	2008-08-10 19:36:43.000000000 +0100
+++ src/gdb/cp-name-parser.y	2008-08-10 19:37:09.000000000 +0100
@@ -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"
Index: src/gdb/xml-tdesc.c
===================================================================
--- src.orig/gdb/xml-tdesc.c	2008-08-10 19:36:43.000000000 +0100
+++ src/gdb/xml-tdesc.c	2008-08-10 19:37:10.000000000 +0100
@@ -443,7 +443,7 @@ fetch_xml_from_file (const char *filenam
 
   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);
Index: src/gdb/gdb_select.h
===================================================================
--- src.orig/gdb/gdb_select.h	2008-08-10 19:36:43.000000000 +0100
+++ src/gdb/gdb_select.h	2008-08-10 19:37:10.000000000 +0100
@@ -22,6 +22,8 @@
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
+#else
+#include <sys/time.h>
 #endif
 
 #ifdef USE_WIN32API