vx32

commit 604a76b3d6d992d6ded978f7bcd1c23bc465b381
parent f9af6420760c094569be2236cf6e53ca71b97fb8
Author: Russ Cox <rsc@swtch.com>
Date:   Wed, 10 Dec 2008 03:29:01 -0800

9vx: more common X11 include (Devon H. O'Dell)

Diffstat:
src/9vx/trap.c
 | 
7
+++++++
src/9vx/x11/x11-inc.h
 | 
3
+--

2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/9vx/trap.c b/src/9vx/trap.c
@@ -108,6 +108,13 @@ trap(Ureg *ureg)
 		sched();
 		break;
 	
+	case 3:	// breakpoint
+		/* restore pc to instruction that caused the trap */
+		ureg->pc--;
+		sprint(buf, "sys: breakpoint");
+		postnote(up, 1, buf, NDebug);
+		break;
+
 	default:
 		if(vno < nelem(excname)){
 			spllo();
diff --git a/src/9vx/x11/x11-inc.h b/src/9vx/x11/x11-inc.h
@@ -14,8 +14,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
-#include <X11/IntrinsicP.h>
-#include <X11/StringDefs.h>
+#include <X11/Xresource.h>
 #include <X11/keysym.h>
 
 #undef Colormap