diff options
| author | Rich Felker <dalias@aerifal.cx> | 2013-05-26 18:22:12 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2013-05-26 18:22:12 -0400 |
| commit | d9265653552a2b667bf3e84407a06edaa7e9f74f (patch) | |
| tree | 2781a8b5385ee8224b4cda826ac159c3b769b995 /arch/x86_64 | |
| parent | 5e642b5a2395893873affa2a121a694943b3f4e0 (diff) | |
| parent | 31ff797787d89bc01a69ca672fb2340ff21a827e (diff) | |
| download | musl-d9265653552a2b667bf3e84407a06edaa7e9f74f.tar.gz musl-d9265653552a2b667bf3e84407a06edaa7e9f74f.tar.xz musl-d9265653552a2b667bf3e84407a06edaa7e9f74f.zip | |
Merge remote-tracking branch 'nsz/review'
Diffstat (limited to 'arch/x86_64')
| -rwxr-xr-x | arch/x86_64/bits/alltypes.h.sh | 8 | ||||
| -rw-r--r-- | arch/x86_64/bits/ioctl.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh index c5e54aab..a6c90327 100755 --- a/arch/x86_64/bits/alltypes.h.sh +++ b/arch/x86_64/bits/alltypes.h.sh @@ -94,12 +94,12 @@ TYPEDEF long off_t; TYPEDEF unsigned int mode_t; TYPEDEF unsigned long nlink_t; -TYPEDEF unsigned long long ino_t; +TYPEDEF unsigned long ino_t; TYPEDEF unsigned long dev_t; TYPEDEF long blksize_t; -TYPEDEF long long blkcnt_t; -TYPEDEF unsigned long long fsblkcnt_t; -TYPEDEF unsigned long long fsfilcnt_t; +TYPEDEF long blkcnt_t; +TYPEDEF unsigned long fsblkcnt_t; +TYPEDEF unsigned long fsfilcnt_t; TYPEDEF void * timer_t; TYPEDEF int clockid_t; diff --git a/arch/x86_64/bits/ioctl.h b/arch/x86_64/bits/ioctl.h index 7f3c0380..77a94551 100644 --- a/arch/x86_64/bits/ioctl.h +++ b/arch/x86_64/bits/ioctl.h @@ -4,9 +4,9 @@ #define _IOC_READ 2U #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0) -#define _IOW(a,b,c) _IOC(1,(a),(b),sizeof(c)) -#define _IOR(a,b,c) _IOC(2,(a),(b),sizeof(c)) -#define _IOWR(a,b,c) _IOC(3,(a),(b),sizeof(c)) +#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c)) +#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c)) +#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c)) #define TCGETS 0x5401 #define TCSETS 0x5402 |