+2009-10-22 Ivan Maidanski <ivmai@mail.ru>
+
+ * include/private/gcconfig.h: Move DebugBreak() workaround (for
+ x86mingw32ce toolchain) to gc_priv.h (after windows.h inclusion).
+
2009-10-22 Ivan Maidanski <ivmai@mail.ru>
* allchblk.c (GC_unmap_old, GC_merge_unmapped, GC_allochblk,
# ifdef PCR
# define ABORT(s) PCR_Base_Panic(s)
# else
-# if defined(MSWINCE) && !defined(UNDER_CE) && !defined(DebugBreak)
+# if defined(MSWINCE) && !defined(DebugBreak) \
+ && (!defined(UNDER_CE) || (defined(__MINGW32CE__) && !defined(ARM32)))
/* This simplifies linking for WinCE (and, probably, doesn't */
/* hurt debugging much); use -DDebugBreak=DebugBreak to override */
- /* this behavior if really needed. */
+ /* this behavior if really needed. This is also a workaround for */
+ /* x86mingw32ce toolchain (if it is still declaring DebugBreak() */
+ /* instead of defining it as a macro). */
# define DebugBreak() _exit(-1) /* there is no abort() in WinCE */
# endif
# ifdef SMALL_CONFIG
# endif
# if defined(x86) || defined(__i386__)
# define I386
-# if defined(__MINGW32CE__) && !defined(DebugBreak)
- /* A workaround for x86mingw32ce toolchain (if it is still */
- /* declaring DebugBreak() instead of defining it as a macro). */
-# define DebugBreak() _exit(-1)
-# endif
# endif
# if defined(_M_ARM) || defined(ARM) || defined(_ARM_)
# define ARM32