[Openocd-svn] r1559 - in trunk: . src/helper src/jtag

[<zw...@ma...>]

Author: zwelch
Date: 2009-04-29 02:33:35 +0200 (Wed, 29 Apr 2009)
New Revision: 1559

Modified:
   trunk/configure.in
   trunk/src/helper/jim-eventloop.c
   trunk/src/helper/replacements.h
   trunk/src/jtag/jtag.c
Log:
Add missing header files to fix C99 compatibility.

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-04-28 20:59:52 UTC (rev 1558)
+++ trunk/configure.in	2009-04-29 00:33:35 UTC (rev 1559)
@@ -9,6 +9,7 @@
 AC_CHECK_HEADERS(jtag_minidriver.h)
 AC_CHECK_HEADERS(sys/param.h)
 AC_CHECK_HEADERS(sys/time.h)
+AC_CHECK_HEADERS(sys/select.h)
 AC_CHECK_HEADERS(elf.h)
 AC_CHECK_HEADERS(strings.h)
 AC_CHECK_HEADERS(stdbool.h)

Modified: trunk/src/helper/jim-eventloop.c
===================================================================
--- trunk/src/helper/jim-eventloop.c	2009-04-28 20:59:52 UTC (rev 1558)
+++ trunk/src/helper/jim-eventloop.c	2009-04-29 00:33:35 UTC (rev 1559)
@@ -62,6 +62,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <stdio.h>
 #include <errno.h>
 
 #include "replacements.h"

Modified: trunk/src/helper/replacements.h
===================================================================
--- trunk/src/helper/replacements.h	2009-04-28 20:59:52 UTC (rev 1558)
+++ trunk/src/helper/replacements.h	2009-04-29 00:33:35 UTC (rev 1559)
@@ -35,9 +35,16 @@
 #if BUILD_ECOSBOARD
 #include <pkgconf/system.h>
 #include <stdlib.h>
-#include <sys/select.h>
 #endif
 
+#ifdef HAVE_SYS_SELECT_H 
+#include <sys/select.h> /* select, FD_SET and friends (POSIX.1-2001) */
+#endif
+
+#ifdef HAVE_SYS_TIME_H 
+#include <sys/time.h> /* FD_SET and friends (pre-POSIX.1-2001) */
+#endif
+
 /* include necessary headers for socket functionality */
 #ifdef _WIN32
 #include <winsock2.h>

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-04-28 20:59:52 UTC (rev 1558)
+++ trunk/src/jtag/jtag.c	2009-04-29 00:33:35 UTC (rev 1559)
@@ -35,9 +35,12 @@
 #include "command.h"
 #include "log.h"
 
-#include "stdlib.h"
-#include "string.h"
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 /* note that this is not marked as static as it must be available from outside jtag.c for those
    that implement the jtag_xxx() minidriver layer