generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am de2781d9: Merge changes I01345c23,I3b57517c

Browse Source 
* commit 'de2781d906f27be4df3e03a8e5041dcc1aeb281d':
  Include linux/termios.h from sys/ioctl.h.
  Update linux/types.h to linux 2.6.20.
This commit is contained in:
Elliott Hughes 2013-07-03 13:39:16 -07:00 committed by Android Git Automerger
commit a8b954c51e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libc/include/sys/ioctl.h
View File

@ -30,6 +30,11 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
/*
* NetBSD and glibc's <sys/ioctl.h> provide some of the
* terminal-related ioctl data structures such as struct winsize.
*/
#include <linux/termios.h>
#include <asm/ioctls.h> #include <asm/ioctls.h>
#include <asm/termbits.h> #include <asm/termbits.h>
#include <sys/ioctl_compat.h> #include <sys/ioctl_compat.h>

6
libc/kernel/common/linux/types.h
View File

@ -33,12 +33,14 @@ typedef __u64 __bitwise __le64;
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
typedef __u64 __bitwise __be64; typedef __u64 __bitwise __be64;
#endif #endif
typedef __u16 __bitwise __sum16;
typedef __u32 __bitwise __wsum;
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct ustat { struct ustat {
__kernel_daddr_t f_tfree; __kernel_daddr_t f_tfree;
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
__kernel_ino_t f_tinode; __kernel_ino_t f_tinode;
char f_fname[6]; char f_fname[6];
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
char f_fpack[6]; char f_fpack[6];
}; };
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#endif #endif