Unified · Split
| @@ -999,7 +999,7 @@ _xgetsnarf(Display *xd) · 998 unmodified lines | ||
| 999 | 999 | { |
| 1000 | 1000 | uchar *data, *xdata; |
| 1001 | 1001 | Atom clipboard, type, prop; |
| 1002 | − ulong len, lastlen, dummy; | |
| 1002 | + unsigned long len, lastlen, dummy; | |
| 1003 | 1003 | int fmt, i; |
| 1004 | 1004 | Window w; |
| 1005 | 1005 | |
| @@ -1067,7 +1067,7 @@ _xgetsnarf(Display *xd) · 61 unmodified lines | ||
| 1067 | 1067 | } |
| 1068 | 1068 | /* get the property */ |
| 1069 | 1069 | data = nil; |
| 1070 | − XGetWindowProperty(xd, xdrawable, prop, 0, SnarfSize/sizeof(ulong), 0, | |
| 1070 | + XGetWindowProperty(xd, xdrawable, prop, 0, SnarfSize/sizeof(unsigned long), 0, | |
| 1071 | 1071 | AnyPropertyType, &type, &fmt, &len, &dummy, &xdata); |
| 1072 | 1072 | if((type != XA_STRING && type != utf8string) || len == 0){ |
| 1073 | 1073 | if(xdata) |
| @@ -4,11 +4,12 @@ · 3 unmodified lines | ||
| 4 | 4 | #include "fns.h" |
| 5 | 5 | #include "error.h" |
| 6 | 6 | |
| 7 | −#undef write | |
| 7 | +extern int panicking; | |
| 8 | 8 | void |
| 9 | 9 | uartputs(char *s, int n) |
| 10 | 10 | { |
| 11 | −// write(1, s, n); | |
| 11 | + if(panicking) | |
| 12 | + write(1, s, n); | |
| 12 | 13 | } |
| 13 | 14 | |
| 14 | 15 | |