From 0ecb96cc1b4482dbc70df9da9145bb2cd31d0ebb Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Tue, 12 May 2009 12:16:31 +0000
Subject: [PATCH] move eCos type definition to types.h where it belongs.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1766 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 src/helper/types.h | 7 ++++++-
 src/jtag/jtag.h    | 4 ----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/helper/types.h b/src/helper/types.h
index 813f6f25c..7a43c3f5f 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -60,7 +60,7 @@ typedef struct jtag_tap_s jtag_tap_t;
 #define true		1
 
 typedef int _Bool;
-#else 
+#else
 typedef bool _Bool;
 #endif	/* __cplusplus */
 #endif	/* HAVE__BOOL */
@@ -136,4 +136,9 @@ static inline void h_u16_to_be(u8* buf, int val)
 	buf[1] = (u8) (val >> 0);
 }
 
+#ifdef __ECOS
+/* eCos plain lacks this definition... */
+typedef CYG_ADDRWORD intptr_t;
+#endif
+
 #endif /* TYPES_H */
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index 19c305809..570059104 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -608,10 +608,6 @@ extern void jtag_add_callback(jtag_callback1_t, u8 *in);
 #endif
 
 
-#ifdef __ECOS
-typedef CYG_ADDRWORD intptr_t;
-#endif
-
 /* This type can store an integer safely by a normal cast on 64 and
  * 32 bit systems. */
 typedef intptr_t jtag_callback_data_t;
-- 
GitLab