jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'nsz/review'

Browse source
This commit is contained in:
Rich Felker 2013-05-26 18:22:12 -04:00
commit d926565355
9 changed files with 30 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/bits/ioctl.h
View file

@ -4,9 +4,9 @@
#define _IOC_READ 2U #define _IOC_READ 2U
#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0) #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
#define _IOW(a,b,c) _IOC(1,(a),(b),sizeof(c)) #define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
#define _IOR(a,b,c) _IOC(2,(a),(b),sizeof(c)) #define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
#define _IOWR(a,b,c) _IOC(3,(a),(b),sizeof(c)) #define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
#define TCGETS 0x5401 #define TCGETS 0x5401
#define TCSETS 0x5402 #define TCSETS 0x5402

6
arch/i386/bits/ioctl.h
View file

@ -4,9 +4,9 @@
#define _IOC_READ 2U #define _IOC_READ 2U
#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0) #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
#define _IOW(a,b,c) _IOC(1,(a),(b),sizeof(c)) #define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
#define _IOR(a,b,c) _IOC(2,(a),(b),sizeof(c)) #define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
#define _IOWR(a,b,c) _IOC(3,(a),(b),sizeof(c)) #define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
#define TCGETS 0x5401 #define TCGETS 0x5401
#define TCSETS 0x5402 #define TCSETS 0x5402

6
arch/microblaze/bits/ioctl.h
View file

@ -4,9 +4,9 @@
#define _IOC_READ 2U #define _IOC_READ 2U
#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0) #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
#define _IOW(a,b,c) _IOC(1,(a),(b),sizeof(c)) #define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
#define _IOR(a,b,c) _IOC(2,(a),(b),sizeof(c)) #define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
#define _IOWR(a,b,c) _IOC(3,(a),(b),sizeof(c)) #define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
#define TCGETS 0x5401 #define TCGETS 0x5401
#define TCSETS 0x5402 #define TCSETS 0x5402

8
arch/mips/bits/ioctl.h
View file

@ -3,10 +3,10 @@
#define _IOC_READ 2U #define _IOC_READ 2U
#define _IOC_WRITE 4U #define _IOC_WRITE 4U
#define _IO(a,b) _IOC(1U,(a),(b),0) #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
#define _IOW(a,b,c) _IOC(4U,(a),(b),sizeof(c)) #define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
#define _IOR(a,b,c) _IOC(2U,(a),(b),sizeof(c)) #define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
#define _IOWR(a,b,c) _IOC(6U,(a),(b),sizeof(c)) #define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
#define TCGETA 0x5401 #define TCGETA 0x5401
#define TCSETA 0x5402 #define TCSETA 0x5402

25
arch/powerpc/bits/ioctl.h
View file

@ -1,31 +1,12 @@
//#define _IOC(a,b,c,d) ( ((a)<<29) | ((b)<<8) | (c) | ((d)<<16) ) #define _IOC(a,b,c,d) ( ((a)<<29) | ((b)<<8) | (c) | ((d)<<16) )
//
#define _IOC_SIZEBITS 13
#define _IOC_DIRBITS 3
#define _IOC_NRBITS 8
#define _IOC_TYPEBITS 8
#define _IOC_NRSHIFT 0
#define _IOC_TYPESHIFT (_IOC_NRSHIFT+_IOC_NRBITS)
#define _IOC_SIZESHIFT (_IOC_TYPESHIFT+_IOC_TYPEBITS)
#define _IOC_DIRSHIFT (_IOC_SIZESHIFT+_IOC_SIZEBITS)
#define _IOC(dir,type,nr,size) \
(((dir) << _IOC_DIRSHIFT) | \
((type) << _IOC_TYPESHIFT) | \
((nr) << _IOC_NRSHIFT) | \
((size) << _IOC_SIZESHIFT))
#define _IOC_NONE 1U #define _IOC_NONE 1U
#define _IOC_WRITE 4U #define _IOC_WRITE 4U
#define _IOC_READ 2U #define _IOC_READ 2U
#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0) #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
#define _IOW(a,b,c) _IOC(_IOC_WRITE,(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 _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 _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
#define FIONCLEX _IO('f', 2) #define FIONCLEX _IO('f', 2)
#define FIOCLEX _IO('f', 1) #define FIOCLEX _IO('f', 1)

8
arch/x86_64/bits/alltypes.h.sh
View file

@ -94,12 +94,12 @@ TYPEDEF long off_t;
TYPEDEF unsigned int mode_t; TYPEDEF unsigned int mode_t;
TYPEDEF unsigned long nlink_t; TYPEDEF unsigned long nlink_t;
TYPEDEF unsigned long long ino_t; TYPEDEF unsigned long ino_t;
TYPEDEF unsigned long dev_t; TYPEDEF unsigned long dev_t;
TYPEDEF long blksize_t; TYPEDEF long blksize_t;
TYPEDEF long long blkcnt_t; TYPEDEF long blkcnt_t;
TYPEDEF unsigned long long fsblkcnt_t; TYPEDEF unsigned long fsblkcnt_t;
TYPEDEF unsigned long long fsfilcnt_t; TYPEDEF unsigned long fsfilcnt_t;
TYPEDEF void * timer_t; TYPEDEF void * timer_t;
TYPEDEF int clockid_t; TYPEDEF int clockid_t;

6
arch/x86_64/bits/ioctl.h
View file

@ -4,9 +4,9 @@
#define _IOC_READ 2U #define _IOC_READ 2U
#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0) #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
#define _IOW(a,b,c) _IOC(1,(a),(b),sizeof(c)) #define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
#define _IOR(a,b,c) _IOC(2,(a),(b),sizeof(c)) #define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
#define _IOWR(a,b,c) _IOC(3,(a),(b),sizeof(c)) #define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
#define TCGETS 0x5401 #define TCGETS 0x5401
#define TCSETS 0x5402 #define TCSETS 0x5402

10
include/sys/time.h
View file

@ -30,15 +30,15 @@ int utimes (const char *, const struct timeval [2]);
#endif #endif
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
int futimes(int, const struct timeval [2]);
int futimesat(int, const char *, const struct timeval [2]);
int lutimes(const char *, const struct timeval [2]);
int settimeofday (const struct timeval *, void *);
int adjtime (const struct timeval *, struct timeval *);
struct timezone { struct timezone {
int tz_minuteswest; int tz_minuteswest;
int tz_dsttime; int tz_dsttime;
}; };
int futimes(int, const struct timeval [2]);
int futimesat(int, const char *, const struct timeval [2]);
int lutimes(const char *, const struct timeval [2]);
int settimeofday(const struct timeval *, const struct timezone *);
int adjtime (const struct timeval *, struct timeval *);
#define timerisset(t) ((t)->tv_sec || (t)->tv_usec) #define timerisset(t) ((t)->tv_sec || (t)->tv_usec)
#define timerclear(t) ((t)->tv_sec = (t)->tv_usec = 0) #define timerclear(t) ((t)->tv_sec = (t)->tv_usec = 0)
#define timercmp(s,t,op) ((s)->tv_sec == (t)->tv_sec ? \ #define timercmp(s,t,op) ((s)->tv_sec == (t)->tv_sec ? \

3
src/linux/settimeofday.c
View file

@ -1,7 +1,8 @@
#define _BSD_SOURCE
#include <sys/time.h> #include <sys/time.h>
#include "syscall.h" #include "syscall.h"
int settimeofday(const struct timeval *tv, void *tz) int settimeofday(const struct timeval *tv, const struct timezone *tz)
{ {
return syscall(SYS_settimeofday, tv, 0); return syscall(SYS_settimeofday, tv, 0);
} }