o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Russ Cox 2009-07-14 22:55:52 -07:00
commit e6c837d612
9 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/cmd/acme/rows.c
View file

@ -269,6 +269,9 @@ rowtype(Row *row, Rune r, Point p)
Window *w;
Text *t;
if(r == 0)
r = Runeerror;
clearmouse();
qlock(&row->lk);
if(bartflag)

6
src/lib9/dirread.c
View file

@ -31,6 +31,12 @@ mygetdents(int fd, struct dirent *buf, int n)
{
return getdents(fd, (void*)buf, n);
}
#elif defined(__AIX__)
static int
mygetdents(int fd, struct dirent *buf, int n)
{
return getdirent(fd, (void*)buf, n);
}
#endif
static int

8
src/libdraw/drawclient.c
View file

@ -34,6 +34,7 @@ _displayconnect(Display *d)
return -1;
}
if(pid == 0){
char *devdraw;
close(p[0]);
dup(p[1], 0);
dup(p[1], 1);
@ -54,9 +55,12 @@ _displayconnect(Display *d)
* instead.
*/
putenv("NOLIBTHREADDAEMONIZE", "1");
devdraw = getenv("DEVDRAW");
if(devdraw == nil)
devdraw = "devdraw";
if(argv0 == nil)
argv0 = "devdraw";
execl("devdraw", argv0, argv0, "(devdraw)", nil);
argv0 = devdraw;
execl(devdraw, argv0, argv0, "(devdraw)", nil);
sysfatal("exec devdraw: %r");
}
close(p[1]);

2
src/mkhdr
View file

@ -6,7 +6,7 @@ OBJTYPE=`uname -m | sed '
s;amd64;x86_64;;
s;/.*;;;
s; ;;g;
s;armv4l;arm;g;
s;armv.*;arm;g;
s;PowerMacintosh;power;g;
s;macppc;power;g;
s;ppc64;power;g;