rs=leaf

Remove XP_OS2_VACPP from the tree

js/src/jsutil.c

@@ -58,26 +58,6 @@
 #	 include "jsprf.h"
 #endif
 
-#if defined(XP_OS2) && defined(DEBUG)
-/* Added definitions for DebugBreak() for 2 different OS/2 compilers.  Doing
- * the int3 on purpose for Visual Age so that a developer can step over the
- * instruction if so desired.  Not always possible if trapping due to exception
- * handling IBM-AKR
- */
-#if defined(XP_OS2_VACPP)
-   #include <builtin.h>
-   #define DebugBreak() { _interrupt(3); }
-#elif defined(XP_OS2_EMX)
-   /* Force a trap */
-   #define DebugBreak() { int *pTrap=NULL; *pTrap = 1; }
-#else
-   #define DebugBreak()
-#endif
-
-#elif defined(XP_OS2)
-   #define DebugBreak()
-#endif /* XP_OS2 && DEBUG */
-
 #ifdef XP_MAC
 /*
  * PStrFromCStr converts the source C string to a destination
@@ -166,9 +146,12 @@ JS_PUBLIC_API(void) JS_Assert(const char *s, const char *file, JSIntn ln)
 #else
     fprintf(stderr, "Assertion failure: %s, at %s:%d\n", s, file, ln);
 #endif
-#if defined(WIN32) || defined(XP_OS2)
+#if defined(WIN32)
     DebugBreak();
 #endif
+#if defined(XP_OS2)
+    asm("int $3");
+#endif
 #ifndef XP_MAC
     abort();
 #endif