Index: /trunk/include/iprt/asm-watcom-x86-16.h
===================================================================
--- /trunk/include/iprt/asm-watcom-x86-16.h	(revision 58787)
+++ /trunk/include/iprt/asm-watcom-x86-16.h	(revision 58788)
@@ -340,6 +340,6 @@
     modify exact [ax cx di];
 
-#undef      ASMMemZero32
-#pragma aux ASMMemZero32 = \
+#undef      ASMMemFill32
+#pragma aux ASMMemFill32 = \
     "and ecx, 0ffffh" /* probably not necessary, lazy bird should check... */ \
     "shr ecx, 2" \
@@ -466,4 +466,15 @@
     modify exact [ax dx];
 
+#undef      ASMBitTest
+#pragma aux ASMBitTest = \
+    "shl edx, 16" \
+    "mov dx, ax" \
+    "bt  es:[bx], edx" \
+    "setc al" \
+    parm [es bx] [ax dx] nomemory \
+    value [al] \
+    modify exact [ax dx] nomemory;
+
+#if 0
 /** @todo this is way to much inline assembly, better off in an external function. */
 #undef      ASMBitFirstClear
@@ -521,4 +532,10 @@
 
 /* ASMBitNextSet: Too much work, do when needed. */
+#else
+/* ASMBitFirstClear: External file.  */
+/* ASMBitNextClear:  External file.  */
+/* ASMBitFirstSet:   External file.  */
+/* ASMBitNextSet:    External file.  */
+#endif
 
 #undef      ASMBitFirstSetU32
Index: /trunk/include/iprt/asm-watcom-x86-32.h
===================================================================
--- /trunk/include/iprt/asm-watcom-x86-32.h	(revision 58787)
+++ /trunk/include/iprt/asm-watcom-x86-32.h	(revision 58788)
@@ -310,6 +310,6 @@
     modify exact [eax ecx edi];
 
-#undef      ASMMemZero32
-#pragma aux ASMMemZero32 = \
+#undef      ASMMemFill32
+#pragma aux ASMMemFill32 = \
     "shr ecx, 2" \
     "rep stosd"  \
@@ -409,4 +409,13 @@
     modify exact [eax];
 
+#undef      ASMBitTest
+#pragma aux ASMBitTest = \
+    "bt  [ecx], eax" \
+    "setc al" \
+    parm [ecx] [eax] nomemory \
+    value [al] \
+    modify exact [eax] nomemory;
+
+#if 0
 /** @todo this is way to much inline assembly, better off in an external function. */
 #undef      ASMBitFirstClear
@@ -454,4 +463,10 @@
 
 /* ASMBitNextSet: Too much work, do when needed. */
+#else
+/* ASMBitFirstClear: External file.  */
+/* ASMBitNextClear:  External file.  */
+/* ASMBitFirstSet:   External file.  */
+/* ASMBitNextSet:    External file.  */
+#endif
 
 #undef      ASMBitFirstSetU32