aboutsummaryrefslogtreecommitdiff
path: root/src/helper
diff options
context:
space:
mode:
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-11 03:48:32 +0000
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-11 03:48:32 +0000
commit5a818f71d77b0327f7f26a5dd17d6baecc1b58ea (patch)
treeb432accc5051b839c2ba23522e2855805450a4c9 /src/helper
parentee22f119de8c9dab5e7b39bba4fa8563ce0940d0 (diff)
downloadriscv-openocd-5a818f71d77b0327f7f26a5dd17d6baecc1b58ea.zip
riscv-openocd-5a818f71d77b0327f7f26a5dd17d6baecc1b58ea.tar.gz
riscv-openocd-5a818f71d77b0327f7f26a5dd17d6baecc1b58ea.tar.bz2
Simplify #include directives in ioutil.c, use new header checks.
git-svn-id: svn://svn.berlios.de/openocd/trunk@1705 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/ioutil.c63
1 files changed, 27 insertions, 36 deletions
diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index ef9c0ce..390eb04 100644
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -24,48 +24,39 @@
#endif
#include "log.h"
-#include "types.h"
-#include "configuration.h"
-#include "target.h"
-
-#include "command.h"
-
-#include <time_support.h>
-#include <sys/time.h>
-#include <strings.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#if !BUILD_ECOSBOARD
-#include <malloc.h>
-#endif
-#include <errno.h>
-
+#include "time_support.h"
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <netinet/tcp.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <net/if.h>
+#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
-#include <sys/socket.h>
+#endif
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+#ifdef HAVE_NETDB_H
#include <netdb.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <string.h>
-
-#if !defined(__CYGWIN__)
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+//#ifdef HAVE_NETINET_TCP_H
+//#include <netinet/tcp.h>
+//#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_IFADDRS_H
#include <ifaddrs.h>
#endif
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+//#ifdef HAVE_STRINGS_H
+//#include <strings.h>
+//#endif
-#include <unistd.h>
-#include <stdio.h>
int handle_rm_command(struct command_context_s *cmd_ctx, char *cmd,
char **args, int argc)