diff options
author | Christopher Faylor <me@cgf.cx> | 2005-05-02 03:50:11 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2005-05-02 03:50:11 +0000 |
commit | 05726ddd86c1421add510d5e8395cf7e3ac378f3 (patch) | |
tree | e7a339d3b7773fee264eb134e3acfb1ca87877f2 /winsup/cygwin/include | |
parent | b9b1b38358983f564e48ced1a9a599698e1be36f (diff) | |
download | newlib-05726ddd86c1421add510d5e8395cf7e3ac378f3.zip newlib-05726ddd86c1421add510d5e8395cf7e3ac378f3.tar.gz newlib-05726ddd86c1421add510d5e8395cf7e3ac378f3.tar.bz2 |
white space and minor comment cleanup.
Diffstat (limited to 'winsup/cygwin/include')
-rw-r--r-- | winsup/cygwin/include/cygwin/sysproto.h | 4 | ||||
-rw-r--r-- | winsup/cygwin/include/cygwin/version.h | 6 | ||||
-rw-r--r-- | winsup/cygwin/include/netinet/ip.h | 54 | ||||
-rw-r--r-- | winsup/cygwin/include/netinet/tcp.h | 26 | ||||
-rw-r--r-- | winsup/cygwin/include/pthread.h | 6 | ||||
-rw-r--r-- | winsup/cygwin/include/sys/copying.dj | 4 | ||||
-rw-r--r-- | winsup/cygwin/include/sys/dirent.h | 2 | ||||
-rw-r--r-- | winsup/cygwin/include/sys/lock.h | 2 | ||||
-rw-r--r-- | winsup/cygwin/include/sys/stdio.h | 2 | ||||
-rw-r--r-- | winsup/cygwin/include/sys/termios.h | 2 | ||||
-rw-r--r-- | winsup/cygwin/include/sys/utime.h | 4 | ||||
-rw-r--r-- | winsup/cygwin/include/sys/utmp.h | 14 | ||||
-rw-r--r-- | winsup/cygwin/include/utmpx.h | 12 |
13 files changed, 69 insertions, 69 deletions
diff --git a/winsup/cygwin/include/cygwin/sysproto.h b/winsup/cygwin/include/cygwin/sysproto.h index 5b551f4..cea8a02 100644 --- a/winsup/cygwin/include/cygwin/sysproto.h +++ b/winsup/cygwin/include/cygwin/sysproto.h @@ -54,7 +54,7 @@ struct semctl_args { }; struct semget_args { - key_t key; + key_t key; int nsems; int semflg; }; @@ -63,7 +63,7 @@ struct semop_args { int semid; struct sembuf *sops; size_t nsops; -}; +}; struct shmat_args { int shmid; diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h index d9d520e..00b6b27 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -235,14 +235,14 @@ details. */ 108: Remove unused (hopefully) reent_data export. 109: Oh well. Someone uses reent_data. 110: Export clock_gettime, sigwaitinfo, timer_create, timer_delete, - timer_settime + timer_settime 111: Export sigqueue, sighold. 112: Redefine some mtget fields. 113: Again redefine some mtget fields. Use mt_fileno and mt_blkno as - on Linux. + on Linux. 114: Export rand_r, ttyname_r. 115: Export flockfile, ftrylockfile, funlockfile, getgrgid_r, getgrnam_r, - getlogin_r. + getlogin_r. 116: Export atoll. 117: Export utmpx functions, Return utmp * from pututent. 118: Export getpriority, setpriority. diff --git a/winsup/cygwin/include/netinet/ip.h b/winsup/cygwin/include/netinet/ip.h index 87b5068..653f6db 100644 --- a/winsup/cygwin/include/netinet/ip.h +++ b/winsup/cygwin/include/netinet/ip.h @@ -60,29 +60,29 @@ */ struct ip { #ifdef _IP_VHL - u_char ip_vhl; /* version << 4 | header length >> 2 */ + u_char ip_vhl; /* version << 4 | header length >> 2 */ #else #if BYTE_ORDER == LITTLE_ENDIAN - u_int ip_hl:4, /* header length */ - ip_v:4; /* version */ + u_int ip_hl:4, /* header length */ + ip_v:4; /* version */ #endif #if BYTE_ORDER == BIG_ENDIAN - u_int ip_v:4, /* version */ - ip_hl:4; /* header length */ + u_int ip_v:4, /* version */ + ip_hl:4; /* header length */ #endif #endif /* not _IP_VHL */ - u_char ip_tos; /* type of service */ - u_short ip_len; /* total length */ - u_short ip_id; /* identification */ - u_short ip_off; /* fragment offset field */ + u_char ip_tos; /* type of service */ + u_short ip_len; /* total length */ + u_short ip_id; /* identification */ + u_short ip_off; /* fragment offset field */ #define IP_RF 0x8000 /* reserved fragment flag */ #define IP_DF 0x4000 /* dont fragment flag */ #define IP_MF 0x2000 /* more fragments flag */ #define IP_OFFMASK 0x1fff /* mask for fragmenting bits */ - u_char ip_ttl; /* time to live */ - u_char ip_p; /* protocol */ - u_short ip_sum; /* checksum */ - struct in_addr ip_src,ip_dst; /* source and dest address */ + u_char ip_ttl; /* time to live */ + u_char ip_p; /* protocol */ + u_short ip_sum; /* checksum */ + struct in_addr ip_src,ip_dst; /* source and dest address */ }; #ifdef _IP_VHL @@ -155,24 +155,24 @@ struct ip { * Time stamp option structure. */ struct ip_timestamp { - u_char ipt_code; /* IPOPT_TS */ - u_char ipt_len; /* size of structure (variable) */ - u_char ipt_ptr; /* index of current entry */ + u_char ipt_code; /* IPOPT_TS */ + u_char ipt_len; /* size of structure (variable) */ + u_char ipt_ptr; /* index of current entry */ #if BYTE_ORDER == LITTLE_ENDIAN - u_int ipt_flg:4, /* flags, see below */ - ipt_oflw:4; /* overflow counter */ + u_int ipt_flg:4, /* flags, see below */ + ipt_oflw:4; /* overflow counter */ #endif #if BYTE_ORDER == BIG_ENDIAN - u_int ipt_oflw:4, /* overflow counter */ - ipt_flg:4; /* flags, see below */ + u_int ipt_oflw:4, /* overflow counter */ + ipt_flg:4; /* flags, see below */ #endif - union ipt_timestamp { - n_long ipt_time[1]; - struct ipt_ta { - struct in_addr ipt_addr; - n_long ipt_time; - } ipt_ta[1]; - } ipt_timestamp; + union ipt_timestamp { + n_long ipt_time[1]; + struct ipt_ta { + struct in_addr ipt_addr; + n_long ipt_time; + } ipt_ta[1]; + } ipt_timestamp; }; /* flag bits for ipt_flg */ diff --git a/winsup/cygwin/include/netinet/tcp.h b/winsup/cygwin/include/netinet/tcp.h index 9fcee6c..305527d 100644 --- a/winsup/cygwin/include/netinet/tcp.h +++ b/winsup/cygwin/include/netinet/tcp.h @@ -57,19 +57,19 @@ typedef u_int32_t tcp_cc; /* connection count per rfc1644 */ * Per RFC 793, September, 1981. */ struct tcphdr { - u_short th_sport; /* source port */ - u_short th_dport; /* destination port */ - tcp_seq th_seq; /* sequence number */ - tcp_seq th_ack; /* acknowledgement number */ + u_short th_sport; /* source port */ + u_short th_dport; /* destination port */ + tcp_seq th_seq; /* sequence number */ + tcp_seq th_ack; /* acknowledgement number */ #if BYTE_ORDER == LITTLE_ENDIAN - u_int th_x2:4, /* (unused) */ - th_off:4; /* data offset */ + u_int th_x2:4, /* (unused) */ + th_off:4; /* data offset */ #endif #if BYTE_ORDER == BIG_ENDIAN - u_int th_off:4, /* data offset */ - th_x2:4; /* (unused) */ + u_int th_off:4, /* data offset */ + th_x2:4; /* (unused) */ #endif - u_char th_flags; + u_char th_flags; #define TH_FIN 0x01 #define TH_SYN 0x02 #define TH_RST 0x04 @@ -78,9 +78,9 @@ struct tcphdr { #define TH_URG 0x20 #define TH_FLAGS (TH_FIN|TH_SYN|TH_RST|TH_ACK|TH_URG) - u_short th_win; /* window */ - u_short th_sum; /* checksum */ - u_short th_urp; /* urgent pointer */ + u_short th_win; /* window */ + u_short th_sum; /* checksum */ + u_short th_urp; /* urgent pointer */ }; #define TCPOPT_EOL 0 @@ -129,7 +129,7 @@ struct tcphdr { #define TCP_MAXHLEN (0xf<<2) /* max length of header in bytes */ #define TCP_MAXOLEN (TCP_MAXHLEN - sizeof(struct tcphdr)) - /* max space left for options */ + /* max space left for options */ /* * User-settable options (used with setsockopt). diff --git a/winsup/cygwin/include/pthread.h b/winsup/cygwin/include/pthread.h index 57f58cf..9d07569 100644 --- a/winsup/cygwin/include/pthread.h +++ b/winsup/cygwin/include/pthread.h @@ -117,8 +117,8 @@ void _pthread_cleanup_push (__pthread_cleanup_handler *handler); void _pthread_cleanup_pop (int execute); #define pthread_cleanup_push(_fn, _arg) { __pthread_cleanup_handler __cleanup_handler = \ - { _fn, _arg, NULL }; \ - _pthread_cleanup_push( &__cleanup_handler ); + { _fn, _arg, NULL }; \ + _pthread_cleanup_push( &__cleanup_handler ); #define pthread_cleanup_pop(_execute) _pthread_cleanup_pop( _execute ); } /* Condition variables */ @@ -174,7 +174,7 @@ int pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock); int pthread_rwlock_unlock (pthread_rwlock_t *rwlock); int pthread_rwlockattr_init (pthread_rwlockattr_t *rwlockattr); int pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr, - int *pshared); + int *pshared); int pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared); int pthread_rwlockattr_destroy (pthread_rwlockattr_t *rwlockattr); diff --git a/winsup/cygwin/include/sys/copying.dj b/winsup/cygwin/include/sys/copying.dj index b6d1059..a05f4bc 100644 --- a/winsup/cygwin/include/sys/copying.dj +++ b/winsup/cygwin/include/sys/copying.dj @@ -3,8 +3,8 @@ copyrighted by UCB Berkeley or the Free Software Foundation. Copyright Information for sources and executables that are marked Copyright (C) DJ Delorie - 24 Kirsten Ave - Rochester NH 03867-2954 + 24 Kirsten Ave + Rochester NH 03867-2954 This document is Copyright (C) DJ Delorie and may be distributed verbatim, but changing it is not allowed. diff --git a/winsup/cygwin/include/sys/dirent.h b/winsup/cygwin/include/sys/dirent.h index c3d77c4..17e5eff 100644 --- a/winsup/cygwin/include/sys/dirent.h +++ b/winsup/cygwin/include/sys/dirent.h @@ -7,7 +7,7 @@ details. */ /* Including this file should not require any Windows headers. */ - + #ifndef _SYS_DIRENT_H #define _SYS_DIRENT_H diff --git a/winsup/cygwin/include/sys/lock.h b/winsup/cygwin/include/sys/lock.h index ad0980a..abed827 100644 --- a/winsup/cygwin/include/sys/lock.h +++ b/winsup/cygwin/include/sys/lock.h @@ -22,7 +22,7 @@ typedef void *_LOCK_T; #define _LOCK_T_INITIALIZER ((_LOCK_T)19) #define __LOCK_INIT(CLASS,NAME) \ - CLASS _LOCK_T NAME = _LOCK_T_INITIALIZER; + CLASS _LOCK_T NAME = _LOCK_T_INITIALIZER; #define __LOCK_INIT_RECURSIVE(CLASS,NAME) \ CLASS _LOCK_T NAME = _LOCK_T_RECURSIVE_INITIALIZER; diff --git a/winsup/cygwin/include/sys/stdio.h b/winsup/cygwin/include/sys/stdio.h index 686ad53..596ad02 100644 --- a/winsup/cygwin/include/sys/stdio.h +++ b/winsup/cygwin/include/sys/stdio.h @@ -24,5 +24,5 @@ details. */ # define _funlockfile(fp) __cygwin_lock_unlock ((_LOCK_T *)&(fp)->_lock) # endif #endif - + #endif diff --git a/winsup/cygwin/include/sys/termios.h b/winsup/cygwin/include/sys/termios.h index 6704454..926e11e 100644 --- a/winsup/cygwin/include/sys/termios.h +++ b/winsup/cygwin/include/sys/termios.h @@ -15,7 +15,7 @@ details. */ #define TIOCMGET 0x5415 #define TIOCMSET 0x5418 -#define TIOCINQ 0x541B +#define TIOCINQ 0x541B /* TIOCINQ is utilized instead of FIONREAD which has been accupied for other purposes under CYGWIN. diff --git a/winsup/cygwin/include/sys/utime.h b/winsup/cygwin/include/sys/utime.h index cdd04ea..8a9ec15 100644 --- a/winsup/cygwin/include/sys/utime.h +++ b/winsup/cygwin/include/sys/utime.h @@ -15,10 +15,10 @@ extern "C" { #include <_ansi.h> #include <sys/types.h> -struct utimbuf +struct utimbuf { time_t actime; - time_t modtime; + time_t modtime; }; int _EXFUN(utime, (const char *__path, const struct utimbuf *__buf)); diff --git a/winsup/cygwin/include/sys/utmp.h b/winsup/cygwin/include/sys/utmp.h index 435891b..8828d0f 100644 --- a/winsup/cygwin/include/sys/utmp.h +++ b/winsup/cygwin/include/sys/utmp.h @@ -22,16 +22,16 @@ extern "C" { #endif -struct utmp +struct utmp { - short ut_type; - pid_t ut_pid; + short ut_type; + pid_t ut_pid; char ut_line[UT_LINESIZE]; char ut_id[UT_IDLEN]; - time_t ut_time; - char ut_user[UT_NAMESIZE]; - char ut_host[UT_HOSTSIZE]; - long ut_addr; + time_t ut_time; + char ut_user[UT_NAMESIZE]; + char ut_host[UT_HOSTSIZE]; + long ut_addr; }; extern struct utmp *_getutline (struct utmp *); diff --git a/winsup/cygwin/include/utmpx.h b/winsup/cygwin/include/utmpx.h index 0e24ce8..8029f76 100644 --- a/winsup/cygwin/include/utmpx.h +++ b/winsup/cygwin/include/utmpx.h @@ -21,14 +21,14 @@ extern "C" { /* Must be kept in sync with struct utmp as defined in sys/utmp.h! */ struct utmpx { - short ut_type; - pid_t ut_pid; + short ut_type; + pid_t ut_pid; char ut_line[UT_LINESIZE]; char ut_id[UT_IDLEN]; - time_t ut_time; - char ut_user[UT_NAMESIZE]; - char ut_host[UT_HOSTSIZE]; - long ut_addr; + time_t ut_time; + char ut_user[UT_NAMESIZE]; + char ut_host[UT_HOSTSIZE]; + long ut_addr; struct timeval ut_tv; }; |