Index: /trunk/include/iprt/cdefs.h
===================================================================
--- /trunk/include/iprt/cdefs.h	(revision 58622)
+++ /trunk/include/iprt/cdefs.h	(revision 58623)
@@ -215,6 +215,8 @@
 # if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC64)
 #  define ARCH_BITS 64
+# elif !defined(__I86__) || !defined(__WATCOMC__)
+#  define ARCH_BITS 32
 # else
-#  define ARCH_BITS 32
+#  define ARCH_BITS 16
 # endif
 #endif
@@ -860,5 +862,7 @@
  * Macro that is defined if the compiler understands 64-bit bitfields. */
 #if !defined(RT_OS_OS2) || (!defined(__IBMC__) && !defined(__IBMCPP__))
-# define RT_COMPILER_GROKS_64BIT_BITFIELDS
+# if !defined(__WATCOMC__) /* watcom compiler doesn't grok it either. */
+#  define RT_COMPILER_GROKS_64BIT_BITFIELDS
+# endif
 #endif
 
@@ -2260,4 +2264,7 @@
 #if defined(__IBMC__) || defined(__IBMCPP__)
 # define RT_BREAKPOINT()        __interrupt(3)
+#endif
+#if defined(__WATCOMC__)
+# define RT_BREAKPOINT()        _asm { int 3 }
 #endif
 #ifndef RT_BREAKPOINT