[Openocd-svn] r1716 - trunk/src

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

Author: zwelch
Date: 2009-05-11 07:00:17 +0200 (Mon, 11 May 2009)
New Revision: 1716

Modified:
   trunk/src/ecosboard.c
   trunk/src/openocd.c
Log:
Audit and eliminate redundant #include directives in main src/ files.

Modified: trunk/src/ecosboard.c
===================================================================
--- trunk/src/ecosboard.c	2009-05-11 04:56:37 UTC (rev 1715)
+++ trunk/src/ecosboard.c	2009-05-11 05:00:17 UTC (rev 1716)
@@ -21,68 +21,54 @@
 #include "config.h"
 #endif
 
-#include "log.h"
-#include "types.h"
-#include "jtag.h"
 #include "configuration.h"
+#include "time_support.h"
+
+#include "jtag.h"
 #include "xsvf.h"
 #include "svf.h"
 #include "target.h"
 #include "flash.h"
 #include "nand.h"
 #include "pld.h"
+#include "rom.h"
 
-#include "command.h"
 #include "server.h"
 #include "telnet_server.h"
 #include "gdb_server.h"
 
-#include <time_support.h>
-#include <sys/time.h>
-#include <strings.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <cyg/io/flash.h>
 #include <pkgconf/fs_jffs2.h>	// Address of JFFS2
 #include <network.h>
 
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <cyg/fileio/fileio.h>
+#include <arpa/inet.h>
 #include <dirent.h>
+#include <net/if.h>
+#include <netdb.h>
+#include <netinet/tcp.h>
+#include <stdarg.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+
 #include <cyg/athttpd/http.h>
 #include <cyg/athttpd/socket.h>
 #include <cyg/athttpd/handler.h>
 #include <cyg/athttpd/cgi.h>
 #include <cyg/athttpd/forms.h>
 #include <cyg/discover/discover.h>
+#include <cyg/fileio/fileio.h>
 #include <cyg/hal/hal_diag.h>
-#include <cyg/kernel/kapi.h>
+#include <cyg/io/flash.h>
 #include <cyg/io/serialio.h>
 #include <cyg/io/io.h>
-#include <netinet/tcp.h>
-#include "rom.h"
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <stdio.h>
+#include <cyg/kernel/kapi.h>
+
+#ifdef HAVE_IFADDRS_H
 #include <ifaddrs.h>
-#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
-#include <unistd.h>
-#include <stdio.h>
 #define MAX_IFS 64
 #if defined(CYGPKG_NET_FREEBSD_STACK)
 #include <tftp_support.h>
@@ -1096,20 +1082,7 @@
 #include <cyg/kernel/ktypes.h>         // base kernel types
 #include <cyg/infra/cyg_trac.h>        // tracing macros
 #include <cyg/infra/cyg_ass.h>         // assertion macros
-#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <dirent.h>
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include <cyg/fileio/fileio.h>
-
 #include <cyg/kernel/kapi.h>
 #include <cyg/infra/diag.h>
 

Modified: trunk/src/openocd.c
===================================================================
--- trunk/src/openocd.c	2009-05-11 04:56:37 UTC (rev 1715)
+++ trunk/src/openocd.c	2009-05-11 05:00:17 UTC (rev 1716)
@@ -28,8 +28,6 @@
 #include "config.h"
 #endif
 
-#include "log.h"
-#include "types.h"
 #include "jtag.h"
 #include "configuration.h"
 #include "xsvf.h"
@@ -40,19 +38,14 @@
 #include "pld.h"
 #include "mflash.h"
 
-#include "command.h"
 #include "server.h"
 #include "telnet_server.h"
 #include "gdb_server.h"
 #include "tcl_server.h"
 
-#include <sys/time.h>
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
+#endif
 
 
 #define OPENOCD_VERSION \