Reset wip. Just adding hooks. This is just to reduce the size of the actual change...

[openocd] / src / target / arm11.h

diff --git a/src/target/arm11.h b/src/target/arm11.h
index c2607a6d6ff5ddfa6d2899131ef1edc6f18f84b3..faa93f586de72a3b21556f7278a6e0ad8c1dc814 100644 (file)
--- a/src/target/arm11.h
+++ b/src/target/arm11.h
@@ -33,15 +33,12 @@
     type * variable = calloc(1, sizeof(type) * items)
 
 
-/* Don't know exactly when %zu was added to glibc (CVS says in 1998).
-   Assume for now that its between GCC versions 3.x.x and 4.x.x .
-   MinGW's GCC 3.4.5 comes with a glibc that doesn't support it.
-*/
+/* For MinGW use 'I' prefix to print size_t (instead of 'z') */
 
-#if __GNUC__ > 3
+#ifndef __MSVCRT__
 #define ZU             "%zu"
 #else
-#define ZU             "%u"
+#define ZU             "%Iu"
 #endif
 
 
@@ -196,7 +193,6 @@ int arm11_step(struct target_s *target, int current, u32 address, int handle_bre
 int arm11_assert_reset(struct target_s *target);
 int arm11_deassert_reset(struct target_s *target);
 int arm11_soft_reset_halt(struct target_s *target);
-int arm11_prepare_reset_halt(struct target_s *target);
 
 /* target register access for gdb */
 int arm11_get_gdb_reg_list(struct target_s *target, struct reg_s **reg_list[], int *reg_list_size);