From 24266ca247b659a16aa7e2445f6a3a11144bc917 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 6 Apr 2010 13:51:58 -0600
Subject: [PATCH] Avoid polluting cygwin namespace.

---
 ChangeLog    |    7 +++++++
 configure.ac |    7 +++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7c6d9d6..c3441e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -125,6 +125,13 @@
 	* m4/ltversion.m4: Likewise.
 	* build-aux/ltmain.sh: Likewise.

+2010-04-06  Eric Blake  <address@hidden>
+
+	Avoid polluting cygwin namespace.
+	* configure.ac (FAULT_CONTEXT_INCLUDE): Avoid including
+	<windows.h> on cygwin.
+	Reported by Corinna Vinschen, via Aharon Robbins.
+
 2010-06-04  Bruno Haible  <address@hidden>

 	* m4/libtool.m4: Update from libtool-2.2.8.
diff --git a/configure.ac b/configure.ac
index ce34fa1..1932042 100644
--- a/configure.ac
+++ b/configure.ac
@@ -523,8 +523,11 @@ case "$host_os" in
     CFG_FAULT=fault-win32.h # nonexistent, just a dummy
     ;;
   cygwin*)
-    FAULT_CONTEXT='CONTEXT'
-    FAULT_CONTEXT_INCLUDE='#include <windows.h>'
+    FAULT_CONTEXT='struct _CONTEXT'
+    # CONTEXT is defined in <windows.h>, but cygwin programs should not
+    # normally inspect the contents of CONTEXT, and the outright inclusion
+    # of <windows.h> pollutes the namespace.
+    FAULT_CONTEXT_INCLUDE='struct _CONTEXT;'
     # Cygwin 1.7 uses fault-posix.h. Cygwin 1.5.x needs a hacky workaround.
     if test -z "$CFG_FAULT"; then
       CFG_FAULT=fault-cygwin-old.h
-- 
1.7.4.4