From cfb30bbfa10ec476a69d1e9bcb6f9d1febca9f28 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 31 Jul 2012 13:19:02 +0000 Subject: [PATCH] * windows.h: Don't include stralign.h when build for Cygwin. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@5289 4407c894-4637-0410-b4f5-ada5f102cad1 --- mingw-w64-headers/include/ChangeLog | 4 ++++ mingw-w64-headers/include/windows.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog index da0de49f6..fda3a5990 100644 --- a/mingw-w64-headers/include/ChangeLog +++ b/mingw-w64-headers/include/ChangeLog @@ -1,3 +1,7 @@ +2012-07-31 Corinna Vinschen + + * windows.h: Don't include stralign.h when build for Cygwin. + 2012-07-30 Corinna Vinschen * psdk_inc/_ip_types.h (struct __ms_timeval): Define on LP64 systems. diff --git a/mingw-w64-headers/include/windows.h b/mingw-w64-headers/include/windows.h index d486e601e..d506d348e 100644 --- a/mingw-w64-headers/include/windows.h +++ b/mingw-w64-headers/include/windows.h @@ -110,7 +110,9 @@ #endif #endif +#ifndef __CYGWIN__ #include +#endif #ifdef INC_OLE2 #include