JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* include/winsock.h (timeval): Guard struct and associated 

macros with _TIMEVAL_DEFINED.
	* include/winsock2.h (timeval): Likewise.
This commit is contained in:
Danny Smith 2002-09-12 10:11:05 +00:00
parent a861509239
commit 3f7b89caf1
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/w32api/ChangeLog
View File

@ -1,3 +1,9 @@
2002-09-12 Danny Smith <dannysmith@users.sourceforge.net>
* include/winsock.h (timeval): Guard struct and associated
macros with _TIMEVAL_DEFINED.
* include/winsock2.h (timeval): Likewise.
2002-09-11 Danny Smith <dannysmith@users.sourceforge.net> 2002-09-11 Danny Smith <dannysmith@users.sourceforge.net>
* lib/shell32.def (SHBindtoParent,SHCreateDirectoryEx[AW], * lib/shell32.def (SHBindtoParent,SHCreateDirectoryEx[AW],

15
winsup/w32api/include/winsock.h
View File

@ -83,10 +83,19 @@ for (__i = 0; __i < ((fd_set *)(set))->fd_count ; __i++) {\
#endif /* ndef _SYS_TYPES_FD_SET */ #endif /* ndef _SYS_TYPES_FD_SET */
#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) #if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
#ifndef _TIMEVAL_DEFINED /* also in sys/time.h */
#define _TIMEVAL_DEFINED
struct timeval { struct timeval {
long tv_sec; long tv_sec;
long tv_usec; long tv_usec;
}; };
#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
#define timercmp(tvp, uvp, cmp) \
(((tvp)->tv_sec != (uvp)->tv_sec) ? \
((tvp)->tv_sec cmp (uvp)->tv_sec) : \
((tvp)->tv_usec cmp (uvp)->tv_usec))
#define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0
#endif /* _TIMEVAL_DEFINED */
struct hostent { struct hostent {
char *h_name; char *h_name;
char **h_aliases; char **h_aliases;
@ -99,12 +108,6 @@ struct linger {
u_short l_onoff; u_short l_onoff;
u_short l_linger; u_short l_linger;
}; };
#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
#define timercmp(tvp, uvp, cmp) \
(((tvp)->tv_sec != (uvp)->tv_sec) ? \
((tvp)->tv_sec cmp (uvp)->tv_sec) : \
((tvp)->tv_usec cmp (uvp)->tv_usec))
#define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0
#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */ #endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
#define IOCPARM_MASK 0x7f #define IOCPARM_MASK 0x7f
#define IOC_VOID 0x20000000 #define IOC_VOID 0x20000000

15
winsup/w32api/include/winsock2.h
View File

@ -96,10 +96,19 @@ if (__i == ((fd_set *)(set))->fd_count) {\
This may cause runtime problems with W32 sockets" This may cause runtime problems with W32 sockets"
#endif /* ndef _SYS_TYPES_FD_SET */ #endif /* ndef _SYS_TYPES_FD_SET */
#if !(defined (__INSIDE_CYGWIN__) || (__INSIDE_MSYS__)) #if !(defined (__INSIDE_CYGWIN__) || (__INSIDE_MSYS__))
#ifndef _TIMEVAL_DEFINED /* also in sys/time.h */
#define _TIMEVAL_DEFINED
struct timeval { struct timeval {
long tv_sec; long tv_sec;
long tv_usec; long tv_usec;
}; };
#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
#define timercmp(tvp, uvp, cmp) \
(((tvp)->tv_sec != (uvp)->tv_sec) ? \
((tvp)->tv_sec cmp (uvp)->tv_sec) : \
((tvp)->tv_usec cmp (uvp)->tv_usec))
#define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0
#endif /* _TIMEVAL_DEFINED */
struct hostent { struct hostent {
char *h_name; char *h_name;
char **h_aliases; char **h_aliases;
@ -112,12 +121,6 @@ struct linger {
u_short l_onoff; u_short l_onoff;
u_short l_linger; u_short l_linger;
}; };
#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
#define timercmp(tvp, uvp, cmp) \
(((tvp)->tv_sec != (uvp)->tv_sec) ? \
((tvp)->tv_sec cmp (uvp)->tv_sec) : \
((tvp)->tv_usec cmp (uvp)->tv_usec))
#define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0
#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */ #endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
#define IOCPARM_MASK 0x7f #define IOCPARM_MASK 0x7f
#define IOC_VOID 0x20000000 #define IOC_VOID 0x20000000