diff options
| author | Charles Forsyth <charles.forsyth@gmail.com> | 2018-12-21 15:05:38 +0000 |
|---|---|---|
| committer | Charles Forsyth <charles.forsyth@gmail.com> | 2018-12-21 15:05:38 +0000 |
| commit | 0195c4e25fc394097552c7f5ebf3085ec2d201f5 (patch) | |
| tree | f67d1be5b8f66a11756be790f1e9371340b5be9e /emu/port | |
| parent | 9765fcf68d2e5e39e39c100f798b9d00202e0d0a (diff) | |
| parent | b743441fb25b17bc7b81d3fb599b4ff5f149368b (diff) | |
Merged in yk/inferno-os/AIX-power (pull request #17)
AIX-power port
Approved-by: Charles Forsyth <charles.forsyth@gmail.com>
Diffstat (limited to 'emu/port')
| -rw-r--r-- | emu/port/devfs-posix.c | 2 | ||||
| -rw-r--r-- | emu/port/win-x11a.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/emu/port/devfs-posix.c b/emu/port/devfs-posix.c index 02c842f4..14cce877 100644 --- a/emu/port/devfs-posix.c +++ b/emu/port/devfs-posix.c @@ -9,7 +9,7 @@ #include <sys/types.h> #include <sys/stat.h> -#include <sys/fcntl.h> +#include <fcntl.h> #include <sys/socket.h> #include <sys/un.h> #include <utime.h> diff --git a/emu/port/win-x11a.c b/emu/port/win-x11a.c index 3670b260..569287b6 100644 --- a/emu/port/win-x11a.c +++ b/emu/port/win-x11a.c @@ -304,7 +304,7 @@ copy32to32(Rectangle r) lp = dp + width; while(dp < lp){ v = *dp++; - w = infernortox11[(v>>16)&0xff]<<16|infernogtox11[(v>>8)&0xff]<<8|infernobtox11[(v>>0)&0xff]<<0; + w = v&(0xff<<24)|infernortox11[(v>>16)&0xff]<<16|infernogtox11[(v>>8)&0xff]<<8|infernobtox11[(v>>0)&0xff]<<0; *wp++ = w; } dp += dx; |