diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-08 15:07:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-08 15:07:46 +0200 |
| commit | b5a2c971202ff19079cb5a98253d8760ae124d15 (patch) | |
| tree | 451469af3bf1c7d9ce0236ba546867bbf6a2fb3a /X11/Xpoll.h.in | |
| parent | 71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec (diff) | |
| parent | d435b20322433b335a4fc5693cce0399a3f27b2d (diff) | |
| download | vcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.tar.gz vcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.tar.bz2 vcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/Xwindows.h
Diffstat (limited to 'X11/Xpoll.h.in')
| -rw-r--r-- | X11/Xpoll.h.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/X11/Xpoll.h.in b/X11/Xpoll.h.in index 827565809..0a0542420 100644 --- a/X11/Xpoll.h.in +++ b/X11/Xpoll.h.in @@ -50,7 +50,7 @@ from The Open Group. #ifndef _XPOLL_H_ #define _XPOLL_H_ -#ifndef WIN32 +#if !defined(WIN32) || defined(__CYGWIN__) #ifndef USE_POLL |