# HG changeset patch # User Ben Wing # Date 1263457277 21600 # Node ID e1d8b6b0c5898d7c094efbbe4856f51a85ac7388 # Parent 34ff4dd7397deb28c05d25c61cf706468730272b Define CYGWIN_HEADERS in s/cygwin32.h and s/mingw32.h instead of syswindows.h, so they're available everywhere diff -r 34ff4dd7397d -r e1d8b6b0c589 src/s/cygwin32.h --- a/src/s/cygwin32.h Thu Jan 14 02:34:47 2010 -0600 +++ b/src/s/cygwin32.h Thu Jan 14 02:21:17 2010 -0600 @@ -47,6 +47,9 @@ /* Identify ourselves */ #define CYGWIN +/* We are using Cygwin-style headers in /usr/include, also used by MinGW */ +#define CYGWIN_HEADERS + /* cheesy way to determine cygwin version */ #ifndef NOT_C_CODE # include diff -r 34ff4dd7397d -r e1d8b6b0c589 src/s/mingw32.h --- a/src/s/mingw32.h Thu Jan 14 02:34:47 2010 -0600 +++ b/src/s/mingw32.h Thu Jan 14 02:21:17 2010 -0600 @@ -27,6 +27,10 @@ #define MINGW +/* We are using Cygwin-style headers in /usr/include, also used by + Cygwin itself */ +#define CYGWIN_HEADERS + #ifndef ORDINARY_LINK #define ORDINARY_LINK #endif diff -r 34ff4dd7397d -r e1d8b6b0c589 src/syswindows.h --- a/src/syswindows.h Thu Jan 14 02:34:47 2010 -0600 +++ b/src/syswindows.h Thu Jan 14 02:21:17 2010 -0600 @@ -47,8 +47,7 @@ #define WIN32_LEAN_AND_MEAN #endif -#if defined (CYGWIN) || defined (MINGW) -# define CYGWIN_HEADERS +#ifdef CYGWIN_HEADERS # ifndef _WIN32_IE # define _WIN32_IE 0x0400 # endif