diff --git a/gui-x11/screen.c b/gui-x11/screen.c index 03a97dc..e8743ed 100644 --- a/gui-x11/screen.c +++ b/gui-x11/screen.c @@ -999,7 +999,7 @@ _xgetsnarf(Display *xd) { uchar *data, *xdata; Atom clipboard, type, prop; - ulong len, lastlen, dummy; + unsigned long len, lastlen, dummy; int fmt, i; Window w; @@ -1067,7 +1067,7 @@ _xgetsnarf(Display *xd) } /* get the property */ data = nil; - XGetWindowProperty(xd, xdrawable, prop, 0, SnarfSize/sizeof(ulong), 0, + XGetWindowProperty(xd, xdrawable, prop, 0, SnarfSize/sizeof(unsigned long), 0, AnyPropertyType, &type, &fmt, &len, &dummy, &xdata); if((type != XA_STRING && type != utf8string) || len == 0){ if(xdata) diff --git a/kern/uart.c b/kern/uart.c index e2354cd..da6d93e 100644 --- a/kern/uart.c +++ b/kern/uart.c @@ -4,11 +4,12 @@ #include "fns.h" #include "error.h" -#undef write +extern int panicking; void uartputs(char *s, int n) { -// write(1, s, n); + if(panicking) + write(1, s, n); }