[Openocd-svn] r1761 - in trunk/src: helper target

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

Author: zwelch
Date: 2009-05-12 10:35:17 +0200 (Tue, 12 May 2009)
New Revision: 1761

Modified:
   trunk/src/helper/fileio.h
   trunk/src/helper/jim-eventloop.c
   trunk/src/helper/jim.c
   trunk/src/helper/log.h
   trunk/src/helper/replacements.c
   trunk/src/helper/replacements.h
   trunk/src/target/algorithm.c
   trunk/src/target/target.h
Log:
Audit and remove redundant uses of replacements.h in the tree.

Modified: trunk/src/helper/fileio.h
===================================================================
--- trunk/src/helper/fileio.h	2009-05-12 08:33:18 UTC (rev 1760)
+++ trunk/src/helper/fileio.h	2009-05-12 08:35:17 UTC (rev 1761)
@@ -26,10 +26,10 @@
 #ifndef FILEIO_H
 #define FILEIO_H
 
+#include "types.h"
+
 #define FILEIO_MAX_ERROR_STRING		(128)
 
-#include "replacements.h"
-
 enum fileio_type
 {
 	FILEIO_TEXT,

Modified: trunk/src/helper/jim-eventloop.c
===================================================================
--- trunk/src/helper/jim-eventloop.c	2009-05-12 08:33:18 UTC (rev 1760)
+++ trunk/src/helper/jim-eventloop.c	2009-05-12 08:35:17 UTC (rev 1761)
@@ -61,11 +61,6 @@
 #include "jim-eventloop.h"
 #endif
 
-#include "replacements.h"
-
-
-/* --- */
-
 /* File event structure */
 typedef struct Jim_FileEvent {
     void *handle;

Modified: trunk/src/helper/jim.c
===================================================================
--- trunk/src/helper/jim.c	2009-05-12 08:33:18 UTC (rev 1760)
+++ trunk/src/helper/jim.c	2009-05-12 08:35:17 UTC (rev 1761)
@@ -56,8 +56,6 @@
 #include <stdarg.h>
 #include <limits.h>
 
-#include "replacements.h"
-
 /* Include the platform dependent libraries for
  * dynamic loading of libraries. */
 #ifdef JIM_DYNLIB

Modified: trunk/src/helper/log.h
===================================================================
--- trunk/src/helper/log.h	2009-05-12 08:33:18 UTC (rev 1760)
+++ trunk/src/helper/log.h	2009-05-12 08:35:17 UTC (rev 1761)
@@ -26,7 +26,6 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-#include "replacements.h"
 #include "command.h"
 
 /* logging priorities 

Modified: trunk/src/helper/replacements.c
===================================================================
--- trunk/src/helper/replacements.c	2009-05-12 08:33:18 UTC (rev 1760)
+++ trunk/src/helper/replacements.c	2009-05-12 08:35:17 UTC (rev 1761)
@@ -23,17 +23,10 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 /* DANGER!!!! These must be defined *BEFORE* replacements.h and the malloc() macro!!!! */
 
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 /* 
  * clear_malloc
  *
@@ -65,10 +58,13 @@
 }
 
 #define IN_REPLACEMENTS_C
-#include "replacements.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
-#include <stdio.h>
-
 #ifdef _WIN32
 #include <io.h>
 #endif

Modified: trunk/src/helper/replacements.h
===================================================================
--- trunk/src/helper/replacements.h	2009-05-12 08:33:18 UTC (rev 1760)
+++ trunk/src/helper/replacements.h	2009-05-12 08:35:17 UTC (rev 1761)
@@ -26,8 +26,6 @@
 #ifndef REPLACEMENTS_H
 #define REPLACEMENTS_H
 
-#include "types.h"
-
 /* MIN,MAX macros */
 #ifndef MIN
 #define MIN(a,b) (((a)<(b))?(a):(b))

Modified: trunk/src/target/algorithm.c
===================================================================
--- trunk/src/target/algorithm.c	2009-05-12 08:33:18 UTC (rev 1760)
+++ trunk/src/target/algorithm.c	2009-05-12 08:35:17 UTC (rev 1761)
@@ -22,7 +22,6 @@
 #endif
 
 #include "algorithm.h"
-#include "replacements.h"
 #include "binarybuffer.h"
 
 

Modified: trunk/src/target/target.h
===================================================================
--- trunk/src/target/target.h	2009-05-12 08:33:18 UTC (rev 1760)
+++ trunk/src/target/target.h	2009-05-12 08:35:17 UTC (rev 1761)
@@ -30,8 +30,6 @@
 #include "algorithm.h"
 #include "command.h"
 
-#include "replacements.h"
-
 struct reg_s;
 struct trace_s;
 struct command_context_s;