diff options
Diffstat (limited to 'winsup/cygwin/include')
| -rw-r--r-- | winsup/cygwin/include/sys/dirent.h | 27 | ||||
| -rw-r--r-- | winsup/cygwin/include/sys/elf_common.h | 6 | ||||
| -rw-r--r-- | winsup/cygwin/include/sys/ioctl.h | 8 |
3 files changed, 20 insertions, 21 deletions
diff --git a/winsup/cygwin/include/sys/dirent.h b/winsup/cygwin/include/sys/dirent.h index 1b16bc3d5..996b1ee33 100644 --- a/winsup/cygwin/include/sys/dirent.h +++ b/winsup/cygwin/include/sys/dirent.h @@ -87,30 +87,29 @@ int scandir (const char *__dir, int alphasort (const struct dirent **__a, const struct dirent **__b); /* File types for `d_type'. */ enum - { - DT_UNKNOWN = 0, +{ + DT_UNKNOWN = 0, # define DT_UNKNOWN DT_UNKNOWN - DT_FIFO = 1, + DT_FIFO = 1, # define DT_FIFO DT_FIFO - DT_CHR = 2, + DT_CHR = 2, # define DT_CHR DT_CHR - DT_DIR = 4, + DT_DIR = 4, # define DT_DIR DT_DIR - DT_BLK = 6, + DT_BLK = 6, # define DT_BLK DT_BLK - DT_REG = 8, + DT_REG = 8, # define DT_REG DT_REG - DT_LNK = 10, + DT_LNK = 10, # define DT_LNK DT_LNK - DT_SOCK = 12, + DT_SOCK = 12, # define DT_SOCK DT_SOCK - DT_WHT = 14 + DT_WHT = 14 # define DT_WHT DT_WHT - }; +}; /* Convert between stat structure types and directory types. */ -# define IFTODT(mode) (((mode) & 0170000) >> 12) +# define IFTODT(mode) (((mode) & 0170000) >> 12) # define DTTOIF(dirtype) ((dirtype) << 12) #endif /* _POSIX_SOURCE */ - -#endif +#endif /*_SYS_DIRENT_H*/ diff --git a/winsup/cygwin/include/sys/elf_common.h b/winsup/cygwin/include/sys/elf_common.h index f637c9a50..b864f0464 100644 --- a/winsup/cygwin/include/sys/elf_common.h +++ b/winsup/cygwin/include/sys/elf_common.h @@ -48,7 +48,7 @@ typedef struct { u_int32_t n_type; /* Type of this note. */ } Elf_Note; -/* Indexes into the e_ident array. Keep synced with +/* Indexes into the e_ident array. Keep synced with http://www.sco.com/developer/gabi/ch4.eheader.html */ #define EI_MAG0 0 /* Magic number, byte 0. */ #define EI_MAG1 1 /* Magic number, byte 1. */ @@ -156,12 +156,12 @@ typedef struct { #define SHT_STRTAB 3 /* string table section */ #define SHT_RELA 4 /* relocation section with addends */ #define SHT_HASH 5 /* symbol hash table section */ -#define SHT_DYNAMIC 6 /* dynamic section */ +#define SHT_DYNAMIC 6 /* dynamic section */ #define SHT_NOTE 7 /* note section */ #define SHT_NOBITS 8 /* no space section */ #define SHT_REL 9 /* relocation section - no addends */ #define SHT_SHLIB 10 /* reserved - purpose unknown */ -#define SHT_DYNSYM 11 /* dynamic symbol table section */ +#define SHT_DYNSYM 11 /* dynamic symbol table section */ #define SHT_NUM 12 /* number of section types */ #define SHT_LOOS 0x60000000 /* First of OS specific semantics */ #define SHT_HIOS 0x6fffffff /* Last of OS specific semantics */ diff --git a/winsup/cygwin/include/sys/ioctl.h b/winsup/cygwin/include/sys/ioctl.h index 7222028b7..29f16994b 100644 --- a/winsup/cygwin/include/sys/ioctl.h +++ b/winsup/cygwin/include/sys/ioctl.h @@ -29,21 +29,21 @@ __BEGIN_DECLS #define _IOC_TYPEBITS 8 #define _IOC_SIZEBITS 14 #define _IOC_DIRBITS 2 - + #define _IOC_NRMASK ((1 << _IOC_NRBITS)-1) #define _IOC_TYPEMASK ((1 << _IOC_TYPEBITS)-1) #define _IOC_SIZEMASK ((1 << _IOC_SIZEBITS)-1) #define _IOC_DIRMASK ((1 << _IOC_DIRBITS)-1) - + #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_NONE 0U #define _IOC_WRITE 1U #define _IOC_READ 2U - + #define _IOC(dir,type,nr,size) \ (((dir) << _IOC_DIRSHIFT) | \ + ((type) << _IOC_TYPESHIFT) | \ |