diff options
Diffstat (limited to 'winsup/cygwin/include')
-rw-r--r-- | winsup/cygwin/include/arpa/telnet.h | 6 | ||||
-rw-r--r-- | winsup/cygwin/include/asm/socket.h | 22 | ||||
-rw-r--r-- | winsup/cygwin/include/cygwin/cygwin_dll.h | 10 | ||||
-rw-r--r-- | winsup/cygwin/include/cygwin/if.h | 2 | ||||
-rw-r--r-- | winsup/cygwin/include/cygwin/in.h | 10 | ||||
-rw-r--r-- | winsup/cygwin/include/cygwin/mtio.h | 23 | ||||
-rw-r--r-- | winsup/cygwin/include/cygwin/socket.h | 10 | ||||
-rw-r--r-- | winsup/cygwin/include/getopt.h | 4 | ||||
-rw-r--r-- | winsup/cygwin/include/netdb.h | 6 | ||||
-rw-r--r-- | winsup/cygwin/include/rapi.h | 10 | ||||
-rw-r--r-- | winsup/cygwin/include/sys/copying.dj | 10 | ||||
-rw-r--r-- | winsup/cygwin/include/sys/mtio.h | 5 | ||||
-rw-r--r-- | winsup/cygwin/include/sys/procfs.h | 5 | ||||
-rw-r--r-- | winsup/cygwin/include/sys/resource.h | 2 | ||||
-rw-r--r-- | winsup/cygwin/include/sys/socket.h | 2 | ||||
-rw-r--r-- | winsup/cygwin/include/sys/syslog.h | 48 | ||||
-rw-r--r-- | winsup/cygwin/include/sys/termios.h | 20 | ||||
-rw-r--r-- | winsup/cygwin/include/tzfile.h | 3 |
18 files changed, 94 insertions, 104 deletions
diff --git a/winsup/cygwin/include/arpa/telnet.h b/winsup/cygwin/include/arpa/telnet.h index 3e523ea97..50874765c 100644 --- a/winsup/cygwin/include/arpa/telnet.h +++ b/winsup/cygwin/include/arpa/telnet.h @@ -87,8 +87,8 @@ extern char *telcmds[]; #define TELOPT_STATUS 5 /* give status */ #define TELOPT_TM 6 /* timing mark */ #define TELOPT_RCTE 7 /* remote controlled transmission and echo */ -#define TELOPT_NAOL 8 /* negotiate about output line width */ -#define TELOPT_NAOP 9 /* negotiate about output page size */ +#define TELOPT_NAOL 8 /* negotiate about output line width */ +#define TELOPT_NAOP 9 /* negotiate about output page size */ #define TELOPT_NAOCRD 10 /* negotiate about CR disposition */ #define TELOPT_NAOHTS 11 /* negotiate about horizontal tabstops */ #define TELOPT_NAOHTD 12 /* negotiate about horizontal tab disposition */ @@ -120,7 +120,7 @@ extern char *telcmds[]; #define TELOPT_ENCRYPT 38 /* Encryption option */ #define TELOPT_NEW_ENVIRON 39 /* New - Environment variables */ #define TELOPT_EXOPL 255 /* extended-options-list */ -#define TELOPT_ENVIRON TELOPT_OLD_ENVIRON +#define TELOPT_ENVIRON TELOPT_OLD_ENVIRON #define NTELOPTS (1+TELOPT_NEW_ENVIRON) #ifdef TELOPTS diff --git a/winsup/cygwin/include/asm/socket.h b/winsup/cygwin/include/asm/socket.h index 167919765..905e81505 100644 --- a/winsup/cygwin/include/asm/socket.h +++ b/winsup/cygwin/include/asm/socket.h @@ -42,17 +42,17 @@ #define SO_OOBINLINE 0x0100 /* leave received OOB data in line */ #define SO_DONTLINGER (u_int)(~SO_LINGER) -/* - * Additional options. - */ -#define SO_SNDBUF 0x1001 /* send buffer size */ -#define SO_RCVBUF 0x1002 /* receive buffer size */ -#define SO_SNDLOWAT 0x1003 /* send low-water mark */ -#define SO_RCVLOWAT 0x1004 /* receive low-water mark */ -#define SO_SNDTIMEO 0x1005 /* send timeout */ -#define SO_RCVTIMEO 0x1006 /* receive timeout */ -#define SO_ERROR 0x1007 /* get error status and clear */ -#define SO_TYPE 0x1008 /* get socket type */ +/* + * Additional options. + */ +#define SO_SNDBUF 0x1001 /* send buffer size */ +#define SO_RCVBUF 0x1002 /* receive buffer size */ +#define SO_SNDLOWAT 0x1003 /* send low-water mark */ +#define SO_RCVLOWAT 0x1004 /* receive low-water mark */ +#define SO_SNDTIMEO 0x1005 /* send timeout */ +#define SO_RCVTIMEO 0x1006 /* receive timeout */ +#define SO_ERROR 0x1007 /* get error status and clear */ +#define SO_TYPE 0x1008 /* get socket type */ #endif /* _ASM_SOCKET_H */ diff --git a/winsup/cygwin/include/cygwin/cygwin_dll.h b/winsup/cygwin/include/cygwin/cygwin_dll.h index c97464c1d..37da53d68 100644 --- a/winsup/cygwin/include/cygwin/cygwin_dll.h +++ b/winsup/cygwin/include/cygwin/cygwin_dll.h @@ -15,7 +15,7 @@ details. */ #ifdef __cplusplus #define CDECL_BEGIN extern "C" { -#define CDECL_END } +#define CDECL_END } #else #define CDECL_BEGIN #define CDECL_END @@ -27,7 +27,7 @@ CDECL_BEGIN \ int WINAPI Entry (HINSTANCE h, DWORD reason, void *ptr); \ typedef int (*mainfunc) (int, char **, char **); \ extern int cygwin_attach_dll (HMODULE, mainfunc); \ - extern void cygwin_detach_dll (DWORD); \ + extern void cygwin_detach_dll (DWORD); \ CDECL_END \ \ static HINSTANCE storedHandle; \ @@ -53,7 +53,7 @@ int WINAPI _cygwin_dll_entry (HINSTANCE h, DWORD reason, void *ptr) \ storedHandle = h; \ storedReason = reason; \ storedPtr = ptr; \ - dll_index = cygwin_attach_dll (h, &__dllMain); \ + dll_index = cygwin_attach_dll (h, &__dllMain); \ if (dll_index == (DWORD) -1) \ ret = 0; \ } \ @@ -64,12 +64,12 @@ int WINAPI _cygwin_dll_entry (HINSTANCE h, DWORD reason, void *ptr) \ ret = Entry (h, reason, ptr); \ if (ret) \ { \ - cygwin_detach_dll (dll_index); \ + cygwin_detach_dll (dll_index); \ dll_index = (DWORD) -1; \ } \ } \ break; \ - \ + \ case DLL_THREAD_ATTACH: \ { \ ret = Entry (h, reason, ptr); \ diff --git a/winsup/cygwin/include/cygwin/if.h b/winsup/cygwin/include/cygwin/if.h index f16b82992..fe0b8b4c1 100644 --- a/winsup/cygwin/include/cygwin/if.h +++ b/winsup/cygwin/include/cygwin/if.h @@ -24,7 +24,7 @@ extern "C" { * remainder may be interface specific. */ -struct ifreq +struct ifreq { #define IFNAMSIZ 16 union diff --git a/winsup/cygwin/include/cygwin/in.h b/winsup/cygwin/include/cygwin/in.h index 52be73de1..ff6952743 100644 --- a/winsup/cygwin/include/cygwin/in.h +++ b/winsup/cygwin/include/cygwin/in.h @@ -84,7 +84,7 @@ struct in_addr { /* Request struct for multicast socket ops */ -struct ip_mreq +struct ip_mreq { struct in_addr imr_multiaddr; /* IP multicast address of group */ struct in_addr imr_interface; /* local IP address of interface */ @@ -151,13 +151,13 @@ struct sockaddr_in { #define IN_LOOPBACK(a) ((((long int) (a)) & 0xff000000) == 0x7f000000) /* Defines for Multicast INADDR */ -#define INADDR_UNSPEC_GROUP 0xe0000000 /* 224.0.0.0 */ -#define INADDR_ALLHOSTS_GROUP 0xe0000001 /* 224.0.0.1 */ +#define INADDR_UNSPEC_GROUP 0xe0000000 /* 224.0.0.0 */ +#define INADDR_ALLHOSTS_GROUP 0xe0000001 /* 224.0.0.1 */ #define INADDR_MAX_LOCAL_GROUP 0xe00000ff /* 224.0.0.255 */ /* <asm/byteorder.h> contains the htonl type stuff.. */ -#include <asm/byteorder.h> +#include <asm/byteorder.h> /* Some random defines to make it easier in the kernel.. */ #ifdef __KERNEL__ @@ -171,7 +171,7 @@ struct sockaddr_in { * IPv6 definitions as we start to include them. This is just * a beginning dont get excited 8) */ - + struct in6_addr { unsigned char s6_addr[16]; diff --git a/winsup/cygwin/include/cygwin/mtio.h b/winsup/cygwin/include/cygwin/mtio.h index 53ed42c76..7a9bb7ef5 100644 --- a/winsup/cygwin/include/cygwin/mtio.h +++ b/winsup/cygwin/include/cygwin/mtio.h @@ -1,9 +1,6 @@ -/* - * cygwin/mtio.h header file for Cygwin. - * - * Original written by H. Bergman for Linux. - * Changed for Cygwin by C. Vinschen. - */ +/* cygwin/mtio.h header file for Cygwin. + + by C. Vinschen. */ #ifndef _CYGWIN_MTIO_H #define _CYGWIN_MTIO_H @@ -24,7 +21,7 @@ struct mtop { /* Magnetic Tape operations [Not all operations supported by all drivers]: */ #define MTRESET 0 /* +reset drive in case of problems */ #define MTFSF 1 /* forward space over FileMark, - * position at first record of next file + * position at first record of next file */ #define MTBSF 2 /* backward space FileMark (position before FM) */ #define MTFSR 3 /* forward space record */ @@ -67,7 +64,7 @@ struct mtop { /* structure for MTIOCGET - mag tape get status command */ struct mtget { - long mt_type; /* type of magtape device + long mt_type; /* type of magtape device * Cygwin: MT_ISUNKNOWN */ long mt_resid; /* residual count: (not sure) * number of bytes ignored, or @@ -95,7 +92,7 @@ struct mtget { /* structure for MTIOCPOS - mag tape get position command */ struct mtpos { - long mt_blkno; /* current block number */ + long mt_blkno; /* current block number */ }; @@ -116,15 +113,15 @@ struct mtpos { #define GMT_SM(x) ((x) & 0x10000000) /* DDS setmark */ #define GMT_EOD(x) ((x) & 0x08000000) /* DDS EOD */ #define GMT_WR_PROT(x) ((x) & 0x04000000) -/* #define GMT_ ? ((x) & 0x02000000) */ +/* #define GMT_ ? ((x) & 0x02000000) */ #define GMT_ONLINE(x) ((x) & 0x01000000) #define GMT_D_6250(x) ((x) & 0x00800000) #define GMT_D_1600(x) ((x) & 0x00400000) #define GMT_D_800(x) ((x) & 0x00200000) -#define GMT_PADDING(x) ((x) & 0x00100000) /* data padding */ -#define GMT_HW_ECC(x) ((x) & 0x00080000) /* HW error correction */ +#define GMT_PADDING(x) ((x) & 0x00100000) /* data padding */ +#define GMT_HW_ECC(x) ((x) & 0x00080000) /* HW error correction */ #define GMT_DR_OPEN(x) ((x) & 0x00040000) /* door open (no tape) */ -#define GMT_HW_COMP(x) ((x) & 0x00020000) /* HW compression */ +#define GMT_HW_COMP(x) ((x) & 0x00020000) /* HW compression */ #define GMT_IM_REP_EN(x) ((x) & 0x00010000) /* immediate report mode */ /* 16 generic status bits unused */ diff --git a/winsup/cygwin/include/cygwin/socket.h b/winsup/cygwin/include/cygwin/socket.h index cadc7127c..fb2feec9e 100644 --- a/winsup/cygwin/include/cygwin/socket.h +++ b/winsup/cygwin/include/cygwin/socket.h @@ -16,17 +16,17 @@ struct sockaddr { #include <sys/types.h> struct linger { - unsigned short l_onoff; /* Linger active */ + unsigned short l_onoff; /* Linger active */ unsigned short l_linger; /* How long to linger for */ }; -struct msghdr +struct msghdr { void * msg_name; /* Socket name */ int msg_namelen; /* Length of name */ struct iovec * msg_iov; /* Data blocks */ - int msg_iovlen; /* Number of blocks */ - void * msg_accrights; /* Per protocol magic (eg BSD file descriptor passing) */ + int msg_iovlen; /* Number of blocks */ + void * msg_accrights; /* Per protocol magic (eg BSD file descriptor passing) */ int msg_accrightslen; /* Length of rights list */ }; @@ -129,7 +129,7 @@ struct msghdr #define IP_TTL 7 #define IP_TOS 8 #define IP_DONTFRAGMENT 9 - + /* IPX options */ #define IPX_TYPE 1 diff --git a/winsup/cygwin/include/getopt.h b/winsup/cygwin/include/getopt.h index 851ac67e2..407a973ce 100644 --- a/winsup/cygwin/include/getopt.h +++ b/winsup/cygwin/include/getopt.h @@ -39,9 +39,9 @@ extern "C" { #endif struct option { - char * name; + const char *name; int has_arg; - int * flag; + int *flag; int val; }; diff --git a/winsup/cygwin/include/netdb.h b/winsup/cygwin/include/netdb.h index 7e4cc000d..f49a94379 100644 --- a/winsup/cygwin/include/netdb.h +++ b/winsup/cygwin/include/netdb.h @@ -61,7 +61,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif /* * Structures returned by network data base library. All addresses are @@ -98,7 +98,7 @@ struct servent { char *s_proto; /* protocol to use */ }; -struct protoent +struct protoent { char *p_name; /* official protocol name */ char **p_aliases; /* alias list */ @@ -162,7 +162,7 @@ void setrpcent (int); #ifdef __cplusplus }; -#endif +#endif #endif /* !_NETDB_H_ */ diff --git a/winsup/cygwin/include/rapi.h b/winsup/cygwin/include/rapi.h index 9d63d06a9..13d197183 100644 --- a/winsup/cygwin/include/rapi.h +++ b/winsup/cygwin/include/rapi.h @@ -36,7 +36,7 @@ struct IRAPIStreamVtbl typedef HRESULT (STDAPICALLTYPE RAPIEXT)( DWORD cbInput, // [IN] BYTE *pInput, // [IN] - DWORD *pcbOutput, // [OUT] + DWORD *pcbOutput, // [OUT] BYTE **ppOutput, // [OUT] IRAPIStream *pIRAPIStream // [IN] ); @@ -55,10 +55,10 @@ STDAPI_(BOOL) CeCreateProcess(LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES, LPSECURIT STDAPI CeRapiUninit(); STDAPI_(BOOL) CeWriteFile(HANDLE, LPCVOID, DWORD, LPDWORD, LPOVERLAPPED); -STDAPI_(HANDLE) CeCreateFile(LPCWSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD, DWORD, HANDLE); -STDAPI_(BOOL) CeCreateDirectory(LPCWSTR, LPSECURITY_ATTRIBUTES); +STDAPI_(HANDLE) CeCreateFile(LPCWSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD, DWORD, HANDLE); +STDAPI_(BOOL) CeCreateDirectory(LPCWSTR, LPSECURITY_ATTRIBUTES); STDAPI_(DWORD) CeGetLastError(void); -STDAPI_(BOOL) CeGetFileTime(HANDLE, LPFILETIME, LPFILETIME, LPFILETIME); -STDAPI_(BOOL) CeCloseHandle(HANDLE); +STDAPI_(BOOL) CeGetFileTime(HANDLE, LPFILETIME, LPFILETIME, LPFILETIME); +STDAPI_(BOOL) CeCloseHandle(HANDLE); #endif /* _RAPI_H */ diff --git a/winsup/cygwin/include/sys/copying.dj b/winsup/cygwin/include/sys/copying.dj index 7d048f70d..b6d105976 100644 --- a/winsup/cygwin/include/sys/copying.dj +++ b/winsup/cygwin/include/sys/copying.dj @@ -1,5 +1,5 @@ This is the file "copying.dj". It does not apply to any sources -copyrighted by UCB Berkeley or the Free Software Foundation. +copyrighted by UCB Berkeley or the Free Software Foundation. Copyright Information for sources and executables that are marked Copyright (C) DJ Delorie @@ -14,18 +14,18 @@ GNU General Public Licence, with the following exceptions: * Any existing copyright or authorship information in any given source file must remain intact. If you modify a source file, a notice to that -effect must be added to the authorship information in the source file. +effect must be added to the authorship information in the source file. * binaries provided in djgpp may be distributed without sources ONLY if the recipient is given sufficient information to obtain a copy of djgpp themselves. This primarily applies to go32.exe, emu387, stub.exe, and -the graphics drivers. +the graphics drivers. * modified versions of the binaries provided in djgpp must be -distributed under the terms of the GPL. +distributed under the terms of the GPL. * objects and libraries linked into an application may be distributed -without sources. +without sources. ----- diff --git a/winsup/cygwin/include/sys/mtio.h b/winsup/cygwin/include/sys/mtio.h index e21e4fff5..af75e40b2 100644 --- a/winsup/cygwin/include/sys/mtio.h +++ b/winsup/cygwin/include/sys/mtio.h @@ -1,7 +1,4 @@ -/* - * sys/mtio.h header file for Cygwin. - * - */ +/* sys/mtio.h header file for Cygwin. */ #ifndef _SYS_MTIO_H #define _SYS_MTIO_H diff --git a/winsup/cygwin/include/sys/procfs.h b/winsup/cygwin/include/sys/procfs.h index e30da5dc0..9b601b377 100644 --- a/winsup/cygwin/include/sys/procfs.h +++ b/winsup/cygwin/include/sys/procfs.h @@ -1,7 +1,4 @@ -/* - * sys/procfs.h header file for Cygwin. - * - */ +/* sys/procfs.h header file for Cygwin. */ #ifndef _SYS_PROCFS_H #define _SYS_PROCFS_H diff --git a/winsup/cygwin/include/sys/resource.h b/winsup/cygwin/include/sys/resource.h index 42907bc7b..a709ec00f 100644 --- a/winsup/cygwin/include/sys/resource.h +++ b/winsup/cygwin/include/sys/resource.h @@ -11,7 +11,7 @@ extern "C" { #define RUSAGE_CHILDREN -1 /* terminated child processes */ struct rusage { - struct timeval ru_utime; /* user time used */ + struct timeval ru_utime; /* user time used */ struct timeval ru_stime; /* system time used */ long ru_maxrss; long ru_ixrss; /* XXX: 0 */ diff --git a/winsup/cygwin/include/sys/socket.h b/winsup/cygwin/include/sys/socket.h index 13217a068..89b9af7f3 100644 --- a/winsup/cygwin/include/sys/socket.h +++ b/winsup/cygwin/include/sys/socket.h @@ -18,7 +18,7 @@ extern "C" int getsockname (int, struct sockaddr *__addr, int *); int listen (int, int __n); int recv (int, void *__buff, int __len, unsigned int __flags); - int recvfrom (int, char *__buff, int __len, int __flags, + int recvfrom (int, char *__buff, int __len, int __flags, struct sockaddr *__from, int *__fromlen); int send (int, const void *__buff, int __len, unsigned int __flags); int sendto (int, const void *, int, unsigned int, const struct sockaddr *, int); diff --git a/winsup/cygwin/include/sys/syslog.h b/winsup/cygwin/include/sys/syslog.h index 65c6688f2..3186804a5 100644 --- a/winsup/cygwin/include/sys/syslog.h +++ b/winsup/cygwin/include/sys/syslog.h @@ -2,31 +2,31 @@ #define _SYS_LOG_H #include <sys/cdefs.h> -#define LOG_EMERG 0 -#define LOG_ALERT 1 -#define LOG_CRIT 2 -#define LOG_ERR 3 -#define LOG_WARNING 4 -#define LOG_NOTICE 5 -#define LOG_INFO 6 -#define LOG_DEBUG 7 +#define LOG_EMERG 0 +#define LOG_ALERT 1 +#define LOG_CRIT 2 +#define LOG_ERR 3 +#define LOG_WARNING 4 +#define LOG_NOTICE 5 +#define LOG_INFO 6 +#define LOG_DEBUG 7 + +#define LOG_PRIMASK 0x07 -#define LOG_PRIMASK 0x07 - #define LOG_PRI(p) ((p) & LOG_PRIMASK) #define LOG_MAKEPRI(fac, pri) (((fac) << 3) | (pri)) -#define LOG_KERN (0<<3) -#define LOG_USER (1<<3) -#define LOG_MAIL (2<<3) -#define LOG_DAEMON (3<<3) -#define LOG_AUTH (4<<3) -#define LOG_SYSLOG (5<<3) -#define LOG_LPR (6<<3) -#define LOG_NEWS (7<<3) -#define LOG_UUCP (8<<3) -#define LOG_CRON (9<<3) -#define LOG_AUTHPRIV (10<<3) +#define LOG_KERN (0<<3) +#define LOG_USER (1<<3) +#define LOG_MAIL (2<<3) +#define LOG_DAEMON (3<<3) +#define LOG_AUTH (4<<3) +#define LOG_SYSLOG (5<<3) +#define LOG_LPR (6<<3) +#define LOG_NEWS (7<<3) +#define LOG_UUCP (8<<3) +#define LOG_CRON (9<<3) +#define LOG_AUTHPRIV (10<<3) #define LOG_FTP (11<<3) /* Codes through 15 are reserved for system use */ @@ -40,11 +40,11 @@ #define LOG_LOCAL7 (23<<3) #define LOG_NFACILITIES 24 -#define LOG_FACMASK 0x03f8 +#define LOG_FACMASK 0x03f8 #define LOG_FAC(p) (((p) & LOG_FACMASK) >> 3) -#define LOG_MASK(pri) (1 << (pri)) -#define LOG_UPTO(pri) ((1 << ((pri)+1)) - 1) +#define LOG_MASK(pri) (1 << (pri)) +#define LOG_UPTO(pri) ((1 << ((pri)+1)) - 1) /* * Option flags for openlog. diff --git a/winsup/cygwin/include/sys/termios.h b/winsup/cygwin/include/sys/termios.h index b0a242a33..b0dc2e4f3 100644 --- a/winsup/cygwin/include/sys/termios.h +++ b/winsup/cygwin/include/sys/termios.h @@ -8,10 +8,10 @@ #define TCIOFF 2 #define TCION 3 -#define TCGETA 5 -#define TCSETA 6 -#define TCSETAW 7 -#define TCSETAF 8 +#define TCGETA 5 +#define TCSETA 6 +#define TCSETAW 7 +#define TCSETAF 8 #define TCIFLUSH 0 #define TCOFLUSH 1 @@ -167,23 +167,23 @@ #define VDISCARD 1 #define VEOL 2 -#define VEOL2 3 +#define VEOL2 3 #define VEOF 4 #define VERASE 5 #define VINTR 6 #define VKILL 7 -#define VLNEXT 8 +#define VLNEXT 8 #define VMIN 9 #define VQUIT 10 -#define VREPRINT 11 +#define VREPRINT 11 #define VSTART 12 #define VSTOP 13 #define VSUSP 14 -#define VSWTC 15 +#define VSWTC 15 #define VTIME 16 -#define VWERASE 17 +#define VWERASE 17 -#define NCCS 18 +#define NCCS 18 typedef unsigned char cc_t; typedef unsigned int tcflag_t; diff --git a/winsup/cygwin/include/tzfile.h b/winsup/cygwin/include/tzfile.h index 9cce33cd1..6080f8bce 100644 --- a/winsup/cygwin/include/tzfile.h +++ b/winsup/cygwin/include/tzfile.h @@ -6,5 +6,4 @@ #define DAYSPERLYEAR 366 #define isleap(y) (((y) % 4) == 0 && ((y) % 100) != 0 || ((y) % 400) == 0) -#endif - +#endif |