mirrors
/
conterm
mirror of https://github.com/0intro/conterm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mac

This commit is contained in:
Russ Cox 2005-11-02 15:21:51 +00:00
parent e4f9a4578a
commit 06b60293ad
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui-x11/screen.c
View File

@ -999,7 +999,7 @@ _xgetsnarf(Display *xd)
{ {
uchar *data, *xdata; uchar *data, *xdata;
Atom clipboard, type, prop; Atom clipboard, type, prop;
ulong len, lastlen, dummy; unsigned long len, lastlen, dummy;
int fmt, i; int fmt, i;
Window w; Window w;
@ -1067,7 +1067,7 @@ _xgetsnarf(Display *xd)
} }
/* get the property */ /* get the property */
data = nil; 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); AnyPropertyType, &type, &fmt, &len, &dummy, &xdata);
if((type != XA_STRING && type != utf8string) || len == 0){ if((type != XA_STRING && type != utf8string) || len == 0){
if(xdata) if(xdata)

5
kern/uart.c
View File

@ -4,11 +4,12 @@
#include "fns.h" #include "fns.h"
#include "error.h" #include "error.h"
#undef write extern int panicking;
void void
uartputs(char *s, int n) uartputs(char *s, int n)
{ {
// write(1, s, n); if(panicking)
write(1, s, n);
} }