From 9d723cf55ed48b618421a867112cfd0d1749d8a4 Mon Sep 17 00:00:00 2001
From: Dimitri Papadopoulos <dimitri_at@users.sf.net>
Date: Wed, 19 Apr 2006 08:57:16 +0000
Subject: [PATCH] 	* include/mmsystem.h (_LPCWAVEFORMATEX_DEFINED):
 Define. 	Use as guard for the WAVEFORMATEX structure instead of 
 _WAVEFORMATEX_ to avoid clashes with DirectSound. Keep 	_WAVEFORMATEX_
 for compatibility. 	Thanks to:    Andrew Jones <guln at sf dot net>

---
 winsup/w32api/ChangeLog          | 12 ++++++++++--
 winsup/w32api/include/mmsystem.h |  3 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 91b930b07..eb037de58 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,7 +1,15 @@
 2006-04-19  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
-	* include/winnt.h, include/ddk/winddk.h (FIELD_OFFSET):
-	Compile with recent C++ compiler such as gcc 3.4.
+	* include/mmsystem.h (_LPCWAVEFORMATEX_DEFINED): Define.
+	Use as guard for the WAVEFORMATEX structure instead of
+	_WAVEFORMATEX_ to avoid clashes with DirectSound. Keep
+	_WAVEFORMATEX_ for compatibility.
+	Thanks to:    Andrew Jones <guln at sf dot net>
+
+2006-04-19  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+	* include/winnt.h (FIELD_OFFSET): Compile.
+	Recent C++ compiler (gcc 3.4 and better) don't like the original macro.
 	* include/ddk/winddk.h: Ditto.
 
 2006-04-19  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
diff --git a/winsup/w32api/include/mmsystem.h b/winsup/w32api/include/mmsystem.h
index 95da48c0b..e7187fd1a 100644
--- a/winsup/w32api/include/mmsystem.h
+++ b/winsup/w32api/include/mmsystem.h
@@ -1009,7 +1009,8 @@ typedef struct pcmwaveformat_tag {
 	WAVEFORMAT wf;
 	WORD wBitsPerSample;
 } PCMWAVEFORMAT, *PPCMWAVEFORMAT,*LPPCMWAVEFORMAT;
-#ifndef _WAVEFORMATEX_
+#ifndef _LPCWAVEFORMATEX_DEFINED
+#define _LPCWAVEFORMATEX_DEFINED
 #define _WAVEFORMATEX_
 typedef struct tWAVEFORMATEX {
 	WORD wFormatTag;